From 0436248fef19aed7463698a1d7a8d01517956f0f Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 6 Aug 2024 13:40:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/l_lms/新建 文本文档.txt | 0 .../basedata/st/rest/UserAreaController.java | 1 - .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 252928 -> 252928 bytes .../src/main/java/org/nl/wms/sch/AcsUtil.java | 3 +- .../org/nl/wms/sch/tasks/CallEmpReelTask.java | 2 - lms2/nladmin-system/nlsso-server/pom.xml | 5 + .../org/nl/common/logging/annotation/Log.java | 32 ++ .../logging/domain/InterfaceLogType.java | 28 ++ .../nl/system/service/user/dao/SysUser.java | 4 +- .../user/dao/mapper/SysUserMapper.java | 4 + .../service/user/dao/mapper/SysUserMapper.xml | 15 + .../st/controller/UserAreaController.java | 73 ++++ .../basedata/st/service/IUserAreaService.java | 56 +++ .../basedata/st/service/dao/CompositeKey.java | 19 ++ .../wms/basedata/st/service/dao/UserArea.java | 30 ++ .../st/service/dao/mapper/UserareaMapper.java | 16 + .../st/service/dao/mapper/UserareaMapper.xml | 5 + .../basedata/st/service/dto/UserareaDto.java | 21 ++ .../st/service/dto/UserareaQuery.java | 12 + .../st/service/impl/UserareaServiceImpl.java | 98 ++++++ .../acs/controller/AcsToWmsController.java | 115 ++++++- .../wms/ext/acs/service/AcsToWmsService.java | 130 +++++-- .../acs/service/impl/AcsToWmsServiceImpl.java | 217 ++++-------- .../wms/pdm/bi/dao/PdmBiRawfoilworkorder.java | 2 + .../main/java/org/nl/wms/util/URLEnum.java | 31 ++ .../main/resources/config/application-dev.yml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../wms/basedata/product/userArea/index.vue | 323 ++++++++++++++++++ .../wms/basedata/product/userArea/userArea.js | 43 +++ .../wms/pdm/order/rawfoilworkorder/index.vue | 206 ++++------- 30 files changed, 1167 insertions(+), 328 deletions(-) delete mode 100644 lms/nladmin-system/src/main/java/org/nl/l_lms/新建 文本文档.txt create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/domain/InterfaceLogType.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/controller/UserAreaController.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/IUserAreaService.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/CompositeKey.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/UserArea.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/mapper/UserareaMapper.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/mapper/UserareaMapper.xml create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dto/UserareaDto.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dto/UserareaQuery.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/impl/UserareaServiceImpl.java create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/URLEnum.java create mode 100644 lms2/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue create mode 100644 lms2/nladmin-ui/src/views/wms/basedata/product/userArea/userArea.js diff --git a/lms/nladmin-system/src/main/java/org/nl/l_lms/新建 文本文档.txt b/lms/nladmin-system/src/main/java/org/nl/l_lms/新建 文本文档.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java index 1d939c51d..c3e47525b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserAreaController.java @@ -22,7 +22,6 @@ public class UserAreaController { @GetMapping @Log("查询用户信息") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(userAreaService.pageQuery(whereJson, page), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index a3bbbe53a00ecedc02ef80ed49182a5c933d48ce..49177344af286ec9a07ebe31f0bb445f976d3d4a 100644 GIT binary patch delta 32 mcmZqJ!QZfhe?txnD?{z&zq^_XS=tL(7=f5+dm#&R|8)Sdynamic-tp-spring-boot-starter-adapter-webserver 1.1.6.1 + + com.github.jeffreyning + mybatisplus-plus + 1.5.1-RELEASE + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/annotation/Log.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/annotation/Log.java index 4d8105bd8..47a54e22e 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/annotation/Log.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/annotation/Log.java @@ -15,6 +15,8 @@ */ package org.nl.common.logging.annotation; +import org.nl.common.logging.domain.InterfaceLogType; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -28,4 +30,34 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) public @interface Log { String value() default ""; + + /** + * 是否打印到日志文件 + * + * @return + */ + boolean isPrintToLogFile() default false; + + + /** + * 是否插入操作日志表 + * + * @return + */ + boolean isAddLogTable() default true; + + /** + * 是否接口日志 + * + * @return + */ + boolean isInterfaceLog() default false; + + + /** + * 接口日志类型 + * + * @return + */ + InterfaceLogType interfaceLogType() default InterfaceLogType.DEFAULT; } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/domain/InterfaceLogType.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/domain/InterfaceLogType.java new file mode 100644 index 000000000..f241a88a5 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/domain/InterfaceLogType.java @@ -0,0 +1,28 @@ +package org.nl.common.logging.domain; + +/** + * @author: lyd + * @description: + * @Date: 2022/10/11 + */ +public enum InterfaceLogType { + DEFAULT("默认"), + LMS_TO_MES("LMS请求MES"), + MES_TO_LMS("MES请求LMS"), + LMS_TO_CRM("LMS请求CRM"), + CRM_TO_LMS("CRM请求LMS"), + LMS_TO_SAP("LMS请求SAP"), + SAP_TO_LMS("SAP请求LMS"), + LMS_TO_ACS("LMS请求ACS"), + ACS_TO_LMS("ACS请求LMS"); + + private String desc; + + InterfaceLogType(String desc) { + this.desc = desc; + } + + public String getDesc() { + return desc; + } +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java index 616dae88b..1ab850e92 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java @@ -2,6 +2,7 @@ package org.nl.system.service.user.dao; import com.alibaba.fastjson.annotation.JSONField; 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 com.fasterxml.jackson.annotation.JsonFormat; @@ -158,5 +159,6 @@ public class SysUser implements Serializable { */ private String extuser_id; - + @TableField(exist = false) + private String name; } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java index 2effc52f9..41fdaae56 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java @@ -1,6 +1,7 @@ package org.nl.system.service.user.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.nl.common.domain.query.PageQuery; @@ -70,4 +71,7 @@ public interface SysUserMapper extends BaseMapper { * @return List */ List getUserIdByDeptId(String deptId); + + + IPage selectPageLeftJoinAndDept(IPage pages, Map whereJson); } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml index 719c300e1..86cf2e6bd 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml @@ -140,4 +140,19 @@ + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/controller/UserAreaController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/controller/UserAreaController.java new file mode 100644 index 000000000..f124b7551 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/controller/UserAreaController.java @@ -0,0 +1,73 @@ +package org.nl.wms.basedata.st.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.st.service.IUserAreaService; +import org.nl.wms.basedata.st.service.dao.UserArea; +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-08-06 +**/ +@Slf4j +@RestController +@RequestMapping("/api/userArea") +public class UserAreaController { + + @Autowired + private IUserAreaService userAreaService; + + @GetMapping + @Log("查询用户区域绑定") + //@SaCheckPermission("userarea:list") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(userAreaService.queryAll(whereJson,page)),HttpStatus.OK); + } + + @PostMapping("/queryUserArea") + @Log("查询用户对应区域") + public ResponseEntity queryUserArea(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(userAreaService.queryUserArea(whereJson), HttpStatus.OK); + } + + @PostMapping + @Log("新增用户区域绑定") + //@SaCheckPermission("userarea:add") + public ResponseEntity create(@Validated @RequestBody UserArea entity){ + userAreaService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PostMapping("/save") + @Log("保存用户仓库信息") + public ResponseEntity save(@RequestBody JSONObject whereJson) { + userAreaService.saveAreaAuthority(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping + @Log("修改用户区域绑定") + //@SaCheckPermission("userarea:edit") + public ResponseEntity update(@Validated @RequestBody UserArea entity){ + userAreaService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除用户区域绑定") + //@SaCheckPermission("userarea:del") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + userAreaService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/IUserAreaService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/IUserAreaService.java new file mode 100644 index 000000000..6e221c70a --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/IUserAreaService.java @@ -0,0 +1,56 @@ +package org.nl.wms.basedata.st.service; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.common.domain.query.PageQuery; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.system.service.user.dao.SysUser; +import org.nl.wms.basedata.st.service.dao.UserArea; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** +* @description 服务接口 +* @author lyd +* @date 2024-08-06 +**/ +public interface IUserAreaService extends IService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 创建 + * @param entity / + */ + void create(UserArea entity); + + /** + * 编辑 + * @param entity / + */ + void update(UserArea entity); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Set ids); + + /** + * 查询用户对应仓库 + * + * @param whereJson / + */ + List queryUserArea(JSONObject whereJson); + + void saveAreaAuthority(JSONObject whereJson); +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/CompositeKey.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/CompositeKey.java new file mode 100644 index 000000000..a8de657db --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/CompositeKey.java @@ -0,0 +1,19 @@ +package org.nl.wms.basedata.st.service.dao; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author: lyd + * @Description: + * @Date: 2024/8/6 + */ +@Data +public class CompositeKey implements Serializable { + private static final long serialVersionUID = 1L; + + private String product_area; + private String user_id; +} + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/UserArea.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/UserArea.java new file mode 100644 index 000000000..75e7071f4 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/UserArea.java @@ -0,0 +1,30 @@ +package org.nl.wms.basedata.st.service.dao; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** +* @description / +* @author lyd +* @date 2024-08-06 +**/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("st_ivt_userarea") +public class UserArea implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 生产区域 */ + @MppMultiId + private String product_area; + + /** 人员标识 */ + @MppMultiId + private String user_id; + +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/mapper/UserareaMapper.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/mapper/UserareaMapper.java new file mode 100644 index 000000000..a2a9b1160 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/mapper/UserareaMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.basedata.st.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.system.service.user.dao.SysUser; +import org.nl.wms.basedata.st.service.dao.UserArea; + +import java.util.Map; + +/** +* @author lyd +* @date 2024-08-06 +**/ +public interface UserareaMapper extends BaseMapper { + +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/mapper/UserareaMapper.xml b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/mapper/UserareaMapper.xml new file mode 100644 index 000000000..8e2c69e13 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dao/mapper/UserareaMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dto/UserareaDto.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dto/UserareaDto.java new file mode 100644 index 000000000..c5b6dac33 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dto/UserareaDto.java @@ -0,0 +1,21 @@ +package org.nl.wms.basedata.st.service.dto; + +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 2024-08-06 +**/ +@Data +public class UserareaDto implements Serializable { + + /** 生产区域 */ + private String product_area; + + /** 人员标识 */ + private String user_id; +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dto/UserareaQuery.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dto/UserareaQuery.java new file mode 100644 index 000000000..460c35ca2 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/dto/UserareaQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.basedata.st.service.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.basedata.st.service.dao.UserArea; + +/** +* @author lyd +* @date 2024-08-06 +**/ +public class UserareaQuery extends BaseQuery { + +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/impl/UserareaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/impl/UserareaServiceImpl.java new file mode 100644 index 000000000..a0f1a0b4b --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata/st/service/impl/UserareaServiceImpl.java @@ -0,0 +1,98 @@ +package org.nl.wms.basedata.st.service.impl; + +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +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.config.language.LangProcess; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.system.service.user.ISysUserService; +import org.nl.system.service.user.dao.SysUser; +import org.nl.system.service.user.dao.mapper.SysUserMapper; +import org.nl.wms.basedata.st.service.IUserAreaService; +import org.nl.wms.basedata.st.service.dao.mapper.UserareaMapper; +import org.nl.wms.basedata.st.service.dao.UserArea; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** +* @description 服务实现 +* @author lyd +* @date 2024-08-06 +**/ +@Slf4j +@Service +public class UserareaServiceImpl extends ServiceImpl implements IUserAreaService { + + @Autowired + private UserareaMapper userareaMapper; + + @Autowired + private SysUserMapper userMapper; + + @Override + public IPage queryAll(Map whereJson, PageQuery page){ + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = userMapper.selectPageLeftJoinAndDept(pages, whereJson); + return pages; + } + + @Override + public void create(UserArea entity) { + entity.setUser_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + userareaMapper.insert(entity); + } + + @Override + public void update(UserArea entity) { + UserArea dto = userareaMapper.selectById(entity.getUser_id()); + if (dto == null) { + throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); + } + userareaMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + userareaMapper.deleteBatchIds(ids); + } + + @Override + public List queryUserArea(JSONObject whereJson) { + String user_id = whereJson.getString("user_id"); + return userareaMapper.selectList(new LambdaQueryWrapper() + .eq(UserArea::getUser_id, user_id)); + } + + @Override + public void saveAreaAuthority(JSONObject whereJson) { + JSONObject jo = whereJson.getJSONObject("jo"); + JSONArray rows = whereJson.getJSONArray("rows"); + + String user_id = jo.getString("user_id"); + userareaMapper.delete(new LambdaQueryWrapper() + .eq(UserArea::getUser_id, user_id)); + List userAreas = new ArrayList<>(); + for (int i = 0; i < rows.size(); i++) { + JSONObject row = rows.getJSONObject(i); + String product_area = row.getString("product_area"); + UserArea userArea = new UserArea(); + userArea.setUser_id(user_id); + userArea.setProduct_area(product_area); + userAreas.add(userArea); + } + saveBatch(userAreas); + } + +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java index bb9d0e3ec..0f5211c36 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java @@ -2,10 +2,9 @@ package org.nl.wms.ext.acs.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; - - import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; +import org.nl.common.logging.domain.InterfaceLogType; import org.nl.wms.ext.acs.service.AcsToWmsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -16,21 +15,117 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @Author: lyd - * @Description: acs请求lms接口 - * @Date: 2023/6/16 - */ + * @author ludj + * @date 2021-07-21 + **/ @RestController -@RequestMapping("/api/wms") +@RequestMapping("/api/wms/task") @Slf4j public class AcsToWmsController { + @Autowired private AcsToWmsService acsToWmsService; - @PostMapping("/apply") + @PostMapping("/status") + @Log(value = "ACS给WMS反馈任务状态", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) @SaIgnore - public ResponseEntity apply(@RequestBody JSONObject param) { - return new ResponseEntity<>(acsToWmsService.acsApply(param), HttpStatus.OK); + public ResponseEntity receiveTaskStatusAcs(@RequestBody String string) { + log.info("ACS给WMS反馈任务状态:{}", string); + return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(string), HttpStatus.OK); } + @PostMapping("/apply") + @Log(value = "申请任务", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) + @SaIgnore + public ResponseEntity apply(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(acsToWmsService.apply(whereJson), HttpStatus.OK); + } + + @PostMapping("/againApply") + @Log(value = "二次申请任务", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) + @SaIgnore + public ResponseEntity againApply(@RequestBody String task_id) { + return new ResponseEntity<>(acsToWmsService.againApply(task_id), HttpStatus.OK); + } + + @PostMapping("/deviceApply") + @Log(value = "申请贴标、捆扎", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) + @SaIgnore + public ResponseEntity deviceApply(@RequestBody JSONObject jo) { + return new ResponseEntity<>(acsToWmsService.deviceApply(jo), HttpStatus.OK); + } + + @PostMapping("/process") + @Log(value = "RCS上报密集库任务异常处理", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) + @SaIgnore + public ResponseEntity process(@RequestBody JSONObject jo) { + return new ResponseEntity<>(acsToWmsService.process(jo), HttpStatus.OK); + } + + @PostMapping("/shipDeviceUpdate") +// @Log(value = "输送线光电无货上报", isInterfaceLog = true,interfaceLogType= InterfaceLogType.ACS_TO_LMS) + @SaIgnore + public ResponseEntity shipDeviceUpdate(@RequestBody JSONObject jo) { + return new ResponseEntity<>(acsToWmsService.shipDeviceUpdate(jo), HttpStatus.OK); + } + + @PostMapping("/sendDeviceStatus") + @SaIgnore + public ResponseEntity sendDeviceStatus(@RequestBody JSONObject jo) { + return new ResponseEntity<>(acsToWmsService.sendDeviceStatus(jo), HttpStatus.OK); + } + + @PostMapping("/sendCBZInfo") + @SaIgnore + public ResponseEntity sendCBZInfo(@RequestBody JSONObject jo) { + return new ResponseEntity<>(acsToWmsService.sendCBZInfo(jo), HttpStatus.OK); + } + + @PostMapping("/sendGetGoalStruct") + @SaIgnore + public ResponseEntity sendGetGoalStruct(@RequestBody JSONObject jo) { + return new ResponseEntity<>(acsToWmsService.sendGetGoalStruct(jo), HttpStatus.OK); + } + + @PostMapping("/actionFinishRequest") + @SaIgnore + public ResponseEntity actionFinishRequest(@RequestBody JSONObject jo) { + return new ResponseEntity<>(acsToWmsService.actionFinishRequest(jo), HttpStatus.OK); + } + + @PostMapping("/actionFinishRequest2") + @SaIgnore + public ResponseEntity actionFinishRequest2(@RequestBody JSONObject jo) { + return new ResponseEntity<>(acsToWmsService.actionFinishRequest2(jo), HttpStatus.OK); + } + @PostMapping("/initialize") + @Log(value = "仓位初始化", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) + @SaIgnore + public ResponseEntity initialize(@RequestBody JSONObject json) { + acsToWmsService.initialize(json); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/initPoint") + @Log(value = "点位初始化", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) + @SaIgnore + public ResponseEntity initPoint() { + acsToWmsService.initPoint(); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/slitterApply") + @Log(value = "二期分切请求", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) + @SaIgnore + public ResponseEntity slitterApply(@RequestBody JSONObject param) { + return new ResponseEntity<>(acsToWmsService.slitterApply(param), HttpStatus.OK); + } + + @PostMapping("/feedbackSubVolumeWeightApply") + @Log(value = "二期ACS反馈子卷重量", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) + @SaIgnore + public ResponseEntity feedbackSubVolumeWeightApply(@RequestBody JSONObject param) { + return new ResponseEntity<>(acsToWmsService.feedbackSubVolumeWeightApply(param), HttpStatus.OK); + } } + diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index 298a9dadd..09b3a04ca 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -1,33 +1,121 @@ package org.nl.wms.ext.acs.service; import com.alibaba.fastjson.JSONObject; -import org.nl.wms.ext.acs.service.dto.to.BaseResponse; -import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest; -/** - * @Author: lyd - * @Description: acs请求wms - * @Date: 2023/6/26 - */ +import java.util.Map; + public interface AcsToWmsService { - /** - * ACS请求接口 - * @param param - * @return BaseResponse - */ - BaseResponse acsApply(JSONObject param); + /** - * 任务反馈 - * @param param - * @return BaseResponse + * ACS客户端--->WMS服务端 + * ACS向WMS反馈任务状态 + * + * @param string ACS反馈的任务数组 + * @return Map */ - BaseResponse feedbackTaskStatus(JSONObject param); + + Map receiveTaskStatusAcs(String string); + /** - * 实时修改点位状态 - * @param param - * @return BaseResponse + * @param task_id: 任务标识 + * @return 二次申请的点位 */ - BaseResponse realTimeSetPoint(JSONObject param); + String againApply(String task_id); + + + /** + * ACS客户端--->WMS服务端 + * ACS向WMS反馈点位状态 + * + * @param jsonObject 条件 + * @return Map + */ + + Map receivePointStatusFromAcs(Map jsonObject); + + /** + * ACS客户端--->LMS服务端 + * 任务申请 + * + * @param whereJson 条件 + * @return JSONObject + */ + JSONObject apply(JSONObject whereJson); + + /** + * ACS客户端--->LMS服务端 + * 申请贴标、捆扎 + * + * @param whereJson 条件 + * @return JSONObject + */ + JSONObject deviceApply(JSONObject whereJson); + + /** + * ACS客户端--->LMS服务端 + * RCS上报密集库任务异常处理 + * + * @param whereJson 条件 + * @return JSONObject + */ + JSONObject process(JSONObject whereJson); + + /** + * ACS客户端--->LMS服务端 + * 输送线光电无货上报 + * + * @param whereJson 条件 + * @return JSONObject + */ + JSONObject shipDeviceUpdate(JSONObject whereJson); + + /** + * ACS客户端--->LMS服务端 + * 输送线光电无货上报 + * + * @param whereJson 条件 + * @return JSONObject + */ + JSONObject sendDeviceStatus(JSONObject whereJson); + + JSONObject sendCBZInfo(JSONObject whereJson); + + JSONObject sendGetGoalStruct(JSONObject whereJson); + + JSONObject actionFinishRequest(JSONObject whereJson); + + /** + * 仓位初始化 + */ + void initialize(JSONObject json); + + /** + * 点位初始化 + */ + void initPoint(); + + + /** + * 二期分切请求 + * @param param / + * @return / + */ + JSONObject slitterApply(JSONObject param); + + + /** + * 二期ACS反馈子卷重量 + * @param param / + * @return / + */ + JSONObject feedbackSubVolumeWeightApply(JSONObject param); + + /** + * 二楼取货完成请求 + * @param param / + * @return / + */ + JSONObject actionFinishRequest2(JSONObject param); } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 4e9ec7126..0a7c8b064 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -1,165 +1,94 @@ package org.nl.wms.ext.acs.service.impl; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpStatus; import com.alibaba.fastjson.JSONObject; -import lombok.SneakyThrows; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.common.exception.BadRequestException; -import org.nl.config.language.LangProcess; -import org.nl.system.service.notice.ISysNoticeService; import org.nl.wms.ext.acs.service.AcsToWmsService; -import org.nl.wms.ext.acs.service.dto.to.BaseResponse; -import org.nl.wms.ext.acs.service.dto.to.wms.FeedBackTaskStatusRequest; -import org.nl.wms.ext.record.service.ISysInteractRecordService; -import org.nl.wms.sch.task.service.ISchBaseTaskService; -import org.nl.wms.sch.task.service.dao.SchBaseTask; -import org.nl.wms.sch.task_manage.AbstractTask; -import org.nl.wms.sch.task_manage.GeneralDefinition; -import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum; -import org.nl.wms.sch.task_manage.task.TaskFactory; -import org.nl.wms.sch.task_manage.task.core.TaskStatus; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import javax.annotation.PostConstruct; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -/** - * @Author: lyd - * @Description: acs请求wms的实现类 - * @Date: 2023/6/26 - */ -@Slf4j @Service +@RequiredArgsConstructor +@Slf4j public class AcsToWmsServiceImpl implements AcsToWmsService { - - /** - * 将解析的整数与结果相乘 - */ - private Map methodCache = new ConcurrentHashMap<>(); - - @Autowired - private ISchBaseTaskService taskService; - @Autowired - private TaskFactory taskFactory; - @Autowired - private ISysNoticeService noticeService; - @Autowired - private ISysInteractRecordService interactRecordService; - - /** - * 初始化反射方法 - */ - @PostConstruct - public void initCacheMethod() { - for (Method method : this.getClass().getMethods()) { - if (method.getParameterCount() == 1 && method.getParameterTypes()[0] == JSONObject.class) { - methodCache.put(method.getName(), method); - } - } - } - @Override - public BaseResponse acsApply(JSONObject param) { - String requestNo = param.getString("requestNo"); - String requestMethodName = param.getString("request_medthod_name"); - BaseResponse result = BaseResponse.build(requestNo); - try { - // 获取请求方法名 - String requestMethodCode = param.getString("request_medthod_code"); - Method method = methodCache.get(StrUtil.toCamelCase(requestMethodCode)); - if (method == null) { - throw new BadRequestException(LangProcess.msg("error_isNull",requestMethodCode)); - } - result = (BaseResponse) method.invoke(this, param); - } catch (Exception e) { - String message = ObjectUtil.isEmpty(e.getMessage()) - ? ((InvocationTargetException) e).getTargetException().getMessage() - : e.getMessage(); - log.error("ACS请求LMS出现错误: {}", message); - result.setCode(HttpStatus.HTTP_BAD_REQUEST); - result.setMessage(message); - result.setRequestNo(requestNo); - // 消息通知 - noticeService.createNotice("异常信息：" + message, "acsApply: " + param.getString("request_medthod_code"), - NoticeTypeEnum.EXCEPTION.getCode()); - } - // acs对接记录 - interactRecordService.saveRecord(requestMethodName, param, result, GeneralDefinition.ACS_LMS); - return result; - } - - /** - * 提前要料 - * - * @param param - * @return - */ - @Deprecated - @Transactional(rollbackFor = Exception.class) - public BaseResponse pressRequestMaterial2(JSONObject param) { + public Map receiveTaskStatusAcs(String string) { return null; } - /** - * 任务反馈 - */ @Override - public BaseResponse feedbackTaskStatus(JSONObject param) { - // todo: action暂未维护 - String requestNo = param.getString("requestNo"); - FeedBackTaskStatusRequest taskStatusRequest = param.toJavaObject(FeedBackTaskStatusRequest.class); - JSONObject taskInfo = taskStatusRequest.getTask_info(); - if (ObjectUtil.isEmpty(taskInfo)) { - throw new BadRequestException("任务信息不能为空！"); - } - SchBaseTask taskObj = taskService.getByCode(taskInfo.getString("task_code")); - if (ObjectUtil.isEmpty(taskObj)) { - throw new BadRequestException("未找到任务编码为 [" + taskInfo.getString("task_code") + "] 的任务"); - } - // 任务处理类 - String processingClass = taskObj.getConfig_code(); - //1:执行中,2:完成 ,3:acs取消 - String acsTaskStatus = param.getString("task_status"); - String message = ""; - TaskStatus status = TaskStatus.APPLY; - switch (acsTaskStatus) { - case "1": - status = TaskStatus.EXECUTING; - break; - case "2": - status = TaskStatus.FINISHED; - break; - case "3": - status = TaskStatus.CANCELED; - break; - default: - break; - } - // 根据配置去工厂类获得类对象 - AbstractTask abstractTask = taskFactory.getTask(processingClass); - // 更新任务 - try { - abstractTask.updateTaskStatus(taskInfo, status); - } catch (Exception e) { - log.error("任务状态更新失败: {}", message); - return BaseResponse.responseError(requestNo, "任务:[" + taskInfo.getString("task_code") + "]状态更新失败," + message); - } - return BaseResponse.responseOk(requestNo, "任务状态反馈成功！"); + public String againApply(String task_id) { + return null; } - /** - * 实时修改点位状态 - */ - @SneakyThrows @Override - public BaseResponse realTimeSetPoint(JSONObject param) { - return null; + public Map receivePointStatusFromAcs(Map jsonObject) { + return null; + } + + @Override + public JSONObject apply(JSONObject whereJson) { + return null; + } + + @Override + public JSONObject deviceApply(JSONObject whereJson) { + return null; + } + + @Override + public JSONObject process(JSONObject whereJson) { + return null; + } + + @Override + public JSONObject shipDeviceUpdate(JSONObject whereJson) { + return null; + } + + @Override + public JSONObject sendDeviceStatus(JSONObject whereJson) { + return null; + } + + @Override + public JSONObject sendCBZInfo(JSONObject whereJson) { + return null; + } + + @Override + public JSONObject sendGetGoalStruct(JSONObject whereJson) { + return null; + } + + @Override + public JSONObject actionFinishRequest(JSONObject whereJson) { + return null; + } + + @Override + public void initialize(JSONObject json) { + + } + + @Override + public void initPoint() { + + } + + @Override + public JSONObject slitterApply(JSONObject param) { + return null; + } + + @Override + public JSONObject feedbackSubVolumeWeightApply(JSONObject param) { + return null; + } + + @Override + public JSONObject actionFinishRequest2(JSONObject param) { + return null; } } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/dao/PdmBiRawfoilworkorder.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/dao/PdmBiRawfoilworkorder.java index b20a49994..f6014c138 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/dao/PdmBiRawfoilworkorder.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/bi/dao/PdmBiRawfoilworkorder.java @@ -194,6 +194,8 @@ public class PdmBiRawfoilworkorder extends Model { * 请求入半成品库 */ private String is_instor; + private String wind_roll; + private String order_type; /** diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/URLEnum.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/URLEnum.java new file mode 100644 index 000000000..378e2bac7 --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/URLEnum.java @@ -0,0 +1,31 @@ +package org.nl.wms.util; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.nl.config.SpringContextHolder; +import org.nl.system.service.param.impl.SysParamServiceImpl; + +import java.util.function.Supplier; + +/** + * API 接口地址枚举 + */ +@Getter +@AllArgsConstructor +public enum URLEnum { + // + ACS_URL_A1("A1", () -> SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("ACS_URL_A1").getValue()); + + private final String product_area; + + private final Supplier acs_url; + + public static String find(String product_area) { + for (URLEnum value : URLEnum.values()) { + if (product_area.equals(value.getProduct_area())) { + return value.getAcs_url().get(); + } + } + return null; + } +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/lms2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 9ee61a81f..376d4ad39 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/lms2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -8,7 +8,7 @@ nl: port: 3306 username: root password: 12356 - database: nl-platform + database: ldnx_lms2 redis: ip: 127.0.0.1 port: 6379 diff --git a/lms2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/lms2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index aaedad57e..2f22eab79 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/lms2/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -12,7 +12,7 @@ https://juejin.cn/post/6844903775631572999 nlAdmin + value="%cyan(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %cyan(%msg%n)"/> +
+
+ + + +
+ +
+ + + + + +
+ 角色列表 +
+ + + + + + + + + + + + + +
+ + 区域选择 + + 保存 + +
+ + + + + + + + + + + + + + + + diff --git a/lms2/nladmin-ui/src/views/wms/basedata/product/userArea/userArea.js b/lms2/nladmin-ui/src/views/wms/basedata/product/userArea/userArea.js new file mode 100644 index 000000000..025b0f4e7 --- /dev/null +++ b/lms2/nladmin-ui/src/views/wms/basedata/product/userArea/userArea.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' + +export function queryStor(data) { + return request({ + url: '/api/userArea/queryStor', + method: 'post', + data + }) +} + +export function queryUserArea(data) { + return request({ + url: '/api/userArea/queryUserArea', + method: 'post', + data + }) +} + +export function save(data) { + return request({ + url: '/api/userArea/save', + method: 'post', + data + }) +} + +export function getuserArea(data) { + return request({ + url: '/api/userArea/getuserArea', + method: 'post', + data + }) +} + +export function getSect(data) { + return request({ + url: '/api/userArea/getSect', + method: 'post', + data + }) +} + +export default { queryUserArea, queryStor, save, getuserArea, getSect } diff --git a/lms2/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue b/lms2/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue index 583ed01fb..3e520a9af 100644 --- a/lms2/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue +++ b/lms2/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue @@ -8,15 +8,16 @@ :inline="true" class="demo-form-inline" label-position="right" + label-width="80px" label-suffix=":" > - + @@ -28,33 +29,33 @@ - + - - + + - + @@ -66,13 +67,13 @@ - + @@ -92,7 +93,7 @@ :disabled="crud.selections.length !== 1" @click="compelEnd" > - {{ $t('RawFoil.search.button_end') }} + 强制结束 - {{ $t('RawFoil.search.button_weight') }} + 称重 @@ -112,17 +113,17 @@ :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" - :width="computedLabelWidth" + width="800px" > - + - + - + @@ -130,12 +131,12 @@ - + - + @@ -143,12 +144,12 @@ - + - + @@ -156,17 +157,17 @@ - + - + - + - + @@ -190,22 +191,22 @@ - + - - {{ $t('common.No') }} - {{ $t('common.Yes') }} + + 否 + 是
- {{ $t('common.Cancel') }} - {{ $t('common.Confirm') }} + 取消 + 确认
@@ -219,86 +220,22 @@ > - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +