diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java index 35f7c49..4e332ce 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java @@ -105,8 +105,9 @@ public class DesUtil { * @throws Exception */ public static String decrypt(String data, String key) throws Exception { - if (data == null) + if (data == null) { return null; + } BASE64Decoder decoder = new BASE64Decoder(); byte[] buf = decoder.decodeBuffer(data); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java index 2b54c03..fbb320e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java @@ -62,7 +62,8 @@ public class SysCodeRuleServiceImpl extends ServiceImpl().eq(SysCodeRule::getCode, code)).getId(); // 如果flag = 1就执行更新数据库的操作 String flag = (String) form.get("flag"); - List ruleDetails = codeRuleDetailMapper.selectList(new LambdaQueryWrapper().eq(SysCodeRuleDetail::getCode_rule_id, id)); + List ruleDetails = codeRuleDetailMapper.selectList(new LambdaQueryWrapper() + .eq(SysCodeRuleDetail::getCode_rule_id, id).orderByAsc(SysCodeRuleDetail::getSort_num)); String demo = ""; boolean isSame = true; for(SysCodeRuleDetail detail : ruleDetails) { @@ -81,7 +82,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl maxValue) { + if (!isSame || (Long.valueOf(detail.getCurrent_value()) + step) > maxValue) { numValue = detail.getInit_value(); } else { numValue = Integer.parseInt(detail.getCurrent_value()) + step + ""; @@ -104,7 +105,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl classList = mdBaseClassstandardMapper .selectList(new LambdaQueryWrapper().eq(MdBaseClassstandard::getParent_class_id, parentClassId)); int size = classList.size(); @@ -103,7 +105,9 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl() diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/controller/MdCsCustomerbaseController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/controller/MdCsCustomerbaseController.java new file mode 100644 index 0000000..bcf8d3a --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/controller/MdCsCustomerbaseController.java @@ -0,0 +1,66 @@ +package org.nl.wms.database.customer.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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.database.customer.service.IMdCsCustomerbaseService; +import org.nl.wms.database.customer.service.dao.MdCsCustomerbase; +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-12-13 +**/ +@Slf4j +@RestController +@Api(tags = "客户信息管理管理") +@RequestMapping("/api/mdCsCustomerbase") +public class MdCsCustomerbaseController { + + @Autowired + private IMdCsCustomerbaseService mdCsCustomerbaseService; + + @GetMapping + @Log("查询客户信息管理") + @ApiOperation("查询客户信息管理") + //@SaCheckPermission("@el.check('mdCsCustomerbase:list')") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(mdCsCustomerbaseService.queryAll(whereJson,page)),HttpStatus.OK); + } + + @PostMapping + @Log("新增客户信息管理") + @ApiOperation("新增客户信息管理") + //@SaCheckPermission("@el.check('mdCsCustomerbase:add')") + public ResponseEntity create(@Validated @RequestBody MdCsCustomerbase entity){ + mdCsCustomerbaseService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改客户信息管理") + @ApiOperation("修改客户信息管理") + //@SaCheckPermission("@el.check('mdCsCustomerbase:edit')") + public ResponseEntity update(@Validated @RequestBody MdCsCustomerbase entity){ + mdCsCustomerbaseService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除客户信息管理") + @ApiOperation("删除客户信息管理") + //@SaCheckPermission("@el.check('mdCsCustomerbase:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + mdCsCustomerbaseService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/IMdCsCustomerbaseService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/IMdCsCustomerbaseService.java new file mode 100644 index 0000000..62052d6 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/IMdCsCustomerbaseService.java @@ -0,0 +1,50 @@ +package org.nl.wms.database.customer.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.database.customer.service.dao.MdCsCustomerbase; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务接口 +* @author lyd +* @date 2023-12-13 +**/ +public interface IMdCsCustomerbaseService extends IService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 创建 + * @param entity / + */ + void create(MdCsCustomerbase entity); + + /** + * 编辑 + * @param entity / + */ + void update(MdCsCustomerbase entity); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Set ids); + + /** + * 根据code获取客户信息 + * @param code + * @return 客户信息 + */ + MdCsCustomerbase getByCode(String code); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dao/MdCsCustomerbase.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dao/MdCsCustomerbase.java new file mode 100644 index 0000000..fdb22f8 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dao/MdCsCustomerbase.java @@ -0,0 +1,97 @@ +package org.nl.wms.database.customer.service.dao; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** +* @description / +* @author lyd +* @date 2023-12-13 +**/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_cs_customerbase") +public class MdCsCustomerbase implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "cust_id", type = IdType.NONE) + @ApiModelProperty(value = "客户标识") + private String cust_id; + + @ApiModelProperty(value = "客户编码") + private String cust_code; + + @ApiModelProperty(value = "客户名称 ") + private String cust_name; + + @ApiModelProperty(value = "法人代表") + private String jurid_name; + + @ApiModelProperty(value = "税务登记号") + private String tax_no; + + @ApiModelProperty(value = "工商注册号") + private String register_no; + + @ApiModelProperty(value = "经营许可证号") + private String manage_lice_no; + + @ApiModelProperty(value = "营业执照") + private String busi_char_name; + + @ApiModelProperty(value = "行政区划") + private String area_id; + + @ApiModelProperty(value = "邮政编码") + private String zip_code; + + @ApiModelProperty(value = "公司电话") + private String corp_tele_no; + + @ApiModelProperty(value = "公司地址") + private String corp_address; + + @ApiModelProperty(value = "创建人") + private String create_id; + + @ApiModelProperty(value = "创建人姓名") + private String create_name; + + @ApiModelProperty(value = "创建时间") + private String create_time; + + @ApiModelProperty(value = "修改时间") + private String update_time; + + @ApiModelProperty(value = "启用时间") + private String is_used_time; + + @ApiModelProperty(value = "是否启用") + private Boolean is_used; + + @ApiModelProperty(value = "是否删除") + private Boolean is_delete; + + @ApiModelProperty(value = "外部标识") + private String ext_id; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "分类标识") + private String class_id; + + @ApiModelProperty(value = "修改人") + private String update_id; + + @ApiModelProperty(value = "修改人姓名") + private String update_name; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dao/mapper/MdCsCustomerbaseMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dao/mapper/MdCsCustomerbaseMapper.java new file mode 100644 index 0000000..ee0c898 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dao/mapper/MdCsCustomerbaseMapper.java @@ -0,0 +1,12 @@ +package org.nl.wms.database.customer.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.database.customer.service.dao.MdCsCustomerbase; + +/** +* @author lyd +* @date 2023-12-13 +**/ +public interface MdCsCustomerbaseMapper extends BaseMapper { + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dao/mapper/MdCsCustomerbaseMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dao/mapper/MdCsCustomerbaseMapper.xml new file mode 100644 index 0000000..cf6b8ae --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dao/mapper/MdCsCustomerbaseMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dto/MdCsCustomerbaseDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dto/MdCsCustomerbaseDto.java new file mode 100644 index 0000000..3383f42 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dto/MdCsCustomerbaseDto.java @@ -0,0 +1,85 @@ +package org.nl.wms.database.customer.service.dto; + +import lombok.Data; +import java.io.Serializable; + +/** +* @description / +* @author lyd +* @date 2023-12-13 +**/ +@Data +public class MdCsCustomerbaseDto implements Serializable { + + /** 客户标识 */ + private String cust_id; + + /** 客户编码 */ + private String cust_code; + + /** 客户名称 */ + private String cust_name; + + /** 法人代表 */ + private String jurid_name; + + /** 税务登记号 */ + private String tax_no; + + /** 工商注册号 */ + private String register_no; + + /** 经营许可证号 */ + private String manage_lice_no; + + /** 营业执照 */ + private String busi_char_name; + + /** 行政区划 */ + private String area_id; + + /** 邮政编码 */ + private String zip_code; + + /** 公司电话 */ + private String corp_tele_no; + + /** 公司地址 */ + private String corp_address; + + /** 创建人 */ + private String create_id; + + /** 创建人姓名 */ + private String create_name; + + /** 创建时间 */ + private String create_time; + + /** 修改时间 */ + private String update_time; + + /** 启用时间 */ + private String is_used_time; + + /** 是否启用 */ + private Boolean is_used; + + /** 是否删除 */ + private Boolean is_delete; + + /** 外部标识 */ + private String ext_id; + + /** 备注 */ + private String remark; + + /** 分类标识 */ + private String class_id; + + /** 修改人 */ + private String update_id; + + /** 修改人姓名 */ + private String update_name; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dto/MdCsCustomerbaseQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dto/MdCsCustomerbaseQuery.java new file mode 100644 index 0000000..cdfda19 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dto/MdCsCustomerbaseQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.database.customer.service.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.database.customer.service.dao.MdCsCustomerbase; + +/** +* @author lyd +* @date 2023-12-13 +**/ +public class MdCsCustomerbaseQuery extends BaseQuery { + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/impl/MdCsCustomerbaseServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/impl/MdCsCustomerbaseServiceImpl.java new file mode 100644 index 0000000..5ce1c4b --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/impl/MdCsCustomerbaseServiceImpl.java @@ -0,0 +1,98 @@ +package org.nl.wms.database.customer.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.query.QueryWrapper; +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.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.database.customer.service.IMdCsCustomerbaseService; +import org.nl.wms.database.customer.service.dao.mapper.MdCsCustomerbaseMapper; +import org.nl.wms.database.customer.service.dao.MdCsCustomerbase; +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-12-13 +**/ +@Slf4j +@Service +public class MdCsCustomerbaseServiceImpl extends ServiceImpl implements IMdCsCustomerbaseService { + + @Autowired + private MdCsCustomerbaseMapper mdCsCustomerbaseMapper; + + @Override + public IPage queryAll(Map whereJson, PageQuery page){ + LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + mdCsCustomerbaseMapper.selectPage(pages, lam); + return pages; + } + + @Override + public void create(MdCsCustomerbase entity) { + if (ObjectUtil.isEmpty(entity.getCust_code())) { + throw new BadRequestException("客户编码不能为空!"); + } + MdCsCustomerbase customerbase = this.getByCode(entity.getCust_code()); + if (ObjectUtil.isNotEmpty(customerbase)) { + throw new BadRequestException("客户编码[" + entity.getCust_code() + "]已存在!"); + } + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + + entity.setCust_id(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); + mdCsCustomerbaseMapper.insert(entity); + } + + @Override + public void update(MdCsCustomerbase entity) { + MdCsCustomerbase dto = mdCsCustomerbaseMapper.selectById(entity.getCust_id()); + if (dto == null) { + throw new BadRequestException("被删除或无权限，操作失败!"); + } + + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + String now = DateUtil.now(); + entity.setUpdate_id(currentUserId); + entity.setUpdate_name(nickName); + entity.setUpdate_time(now); + + mdCsCustomerbaseMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + mdCsCustomerbaseMapper.deleteBatchIds(ids); + } + + @Override + public MdCsCustomerbase getByCode(String code) { + LambdaQueryWrapper lam = new QueryWrapper().lambda(); + lam.eq(MdCsCustomerbase::getCust_code, code); + return mdCsCustomerbaseMapper.selectOne(lam); + } + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java index 9624d55..1eb1bc4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java @@ -3,7 +3,6 @@ package org.nl.wms.database.material.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.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -20,12 +19,10 @@ import org.nl.wms.database.material.service.dto.MdBaseMaterialQuery; import org.nl.wms.ext.mes.service.dao.mapper.MesRequestMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.function.Consumer; /** @@ -85,7 +82,9 @@ public class MdBaseMaterialServiceImpl extends ServiceImpl { List acsWorkOrderVoList = workorderService.getAcsWorkOrderVos(s); - if (acsWorkOrderVoList.size() == 0) return; + if (acsWorkOrderVoList.size() == 0) { + return; + } AcsWorkOrderVo acsWorkOrderVo = acsWorkOrderVoList.get(0); // 获取一个下发 List list = new CopyOnWriteArrayList<>(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 3dd5489..4515d42 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -487,7 +487,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { * 人工排产确认 */ @Override - public BaseResponse orderVerify(JSONObject param) { // 执行中 + public BaseResponse orderVerify(JSONObject param) { String requestNo = param.getString("requestNo"); String workorderCode = param.getString("order_code"); if (workorderCode == null) { @@ -508,7 +508,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { * 工单完成 */ @Override - public BaseResponse orderFinish(JSONObject param) { // 完成 + public BaseResponse orderFinish(JSONObject param) { String requestNo = param.getString("requestNo"); String workorderCode = param.getString("order_code"); if (workorderCode == null) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java index c1e0931..86b552d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java @@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; /** -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @date 2023-07-19 + **/ @Slf4j @RestController @Api(tags = "外部系统接口记录管理") @@ -32,7 +32,6 @@ public class SysInteractRecordController { @GetMapping @Log("查询外部系统接口记录") @ApiOperation("查询外部系统接口记录") - //@SaCheckPermission("@el.check('sysInteractRecord:list')") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(sysInteractRecordService.queryAll(whereJson,page)),HttpStatus.OK); } @@ -40,7 +39,6 @@ public class SysInteractRecordController { @PostMapping @Log("新增外部系统接口记录") @ApiOperation("新增外部系统接口记录") - //@SaCheckPermission("@el.check('sysInteractRecord:add')") public ResponseEntity create(@Validated @RequestBody SysInteractRecord entity){ sysInteractRecordService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); @@ -49,7 +47,6 @@ public class SysInteractRecordController { @PutMapping @Log("修改外部系统接口记录") @ApiOperation("修改外部系统接口记录") - //@SaCheckPermission("@el.check('sysInteractRecord:edit')") public ResponseEntity update(@Validated @RequestBody SysInteractRecord entity){ sysInteractRecordService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -57,10 +54,14 @@ public class SysInteractRecordController { @Log("删除外部系统接口记录") @ApiOperation("删除外部系统接口记录") - //@SaCheckPermission("@el.check('sysInteractRecord:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { sysInteractRecordService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } + + @GetMapping("/getAllName") + public ResponseEntity getAllName() { + return new ResponseEntity<>(sysInteractRecordService.getAllInteractName(), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java index d29a92a..0bf1cfb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java @@ -11,49 +11,53 @@ import org.nl.wms.ext.record.service.dao.SysInteractRecord; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; import org.nl.wms.pdm.workorder.service.dao.vo.AcsWorkOrderVo; +import java.util.List; import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-07-19 -**/ + * @description 服务接口 + * @author lyd + * @date 2023-07-19 + **/ public interface ISysInteractRecordService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * @param entity / + */ void create(SysInteractRecord entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * @param entity / + */ void update(SysInteractRecord entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * @param ids / + */ void deleteAll(Set ids); /** * 创建记录 + * @param request + * @param response + * @param direction */ void saveRecord(Object request, BaseResponse response, String direction); /** - * + * 记录对接日志 * @param workorder * @param resultForAcs * @param direction @@ -61,14 +65,18 @@ public interface ISysInteractRecordService extends IService { void saveRecord(AcsWorkOrderVo workorder, ResultForAcs resultForAcs, String direction); /** - * - * @param name - * @param request - * @param response - * @param direction + * 保存对接记录 + * @param name 保存对接记录 + * @param request 请求参数 + * @param response 响应参数，分类别 + * @param direction 请求方向 */ void saveRecord(String name, K request, V response, String direction); + /** + * 通过天数删除对接记录数据 + * @param day 天数 + */ void deleteByDay(String day); /** @@ -77,4 +85,10 @@ public interface ISysInteractRecordService extends IService { * @param maxRowsToDelete 最大删除数 */ void deleteByRows(Param maxRowsToKeep, Param maxRowsToDelete); + + /** + * 获取所有标题 + * @return List + */ + List getAllInteractName(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java index a2655a4..f847209 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java @@ -3,13 +3,30 @@ package org.nl.wms.ext.record.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.ext.record.service.dao.SysInteractRecord; +import java.util.List; + /** -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @date 2023-07-19 + **/ public interface SysInteractRecordMapper extends BaseMapper { + /** + * 通过天数删除对接记录数据 + * @param day 天数 + */ void deleteByDay(String day); + /** + * 删除行数 + * @param maxRowsToKeep 保留行数 + * @param maxRowsToDelete 删除行数 + */ void deleteByRows(String maxRowsToKeep, String maxRowsToDelete); + + /** + * 获取所有对接名称 + * @return List + */ + List getAllInteractName(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml index af5b747..9a16974 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml @@ -9,4 +9,11 @@ CALL DeleteRowsIfNeeded(#{maxRowsToKeep}, #{maxRowsToDelete}) + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java index 5a527c2..2c2dddc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java @@ -25,14 +25,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; import java.util.Map; import java.util.Set; /** -* @description 服务实现 -* @author lyd -* @date 2023-07-19 -**/ + * @description 服务实现 + * @author lyd + * @date 2023-07-19 + **/ @Slf4j @Service public class SysInteractRecordServiceImpl extends ServiceImpl implements ISysInteractRecordService { @@ -42,10 +43,18 @@ public class SysInteractRecordServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ - String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry")) ? whereJson.get("blurry").toString() : null; - String interactDirection = ObjectUtil.isNotEmpty(whereJson.get("interact_direction")) ? whereJson.get("interact_direction").toString() : null; + String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry")) + ? whereJson.get("blurry").toString() : null; + String interactDirection = ObjectUtil.isNotEmpty(whereJson.get("interact_direction")) + ? whereJson.get("interact_direction").toString() : null; + String interactName = ObjectUtil.isNotEmpty(whereJson.get("interact_name")) + ? whereJson.get("interact_name").toString() : null; + String httpCode = ObjectUtil.isNotEmpty(whereJson.get("http_code")) + ? whereJson.get("http_code").toString() : null; LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); lam.eq(interactDirection!=null, SysInteractRecord::getDirection, interactDirection) + .eq(ObjectUtil.isNotEmpty(interactName), SysInteractRecord::getInteract_name, interactName) + .eq(ObjectUtil.isNotEmpty(httpCode), SysInteractRecord::getCode, httpCode) .and(blurry != null, s -> s.like(SysInteractRecord::getInteract_name, blurry) .or() .like(SysInteractRecord::getMessage, blurry) @@ -69,7 +78,9 @@ public class SysInteractRecordServiceImpl extends ServiceImpl getAllInteractName() { + return sysInteractRecordMapper.getAllInteractName(); + } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java index d5107ad..b8161e4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java @@ -168,7 +168,9 @@ public abstract class AbstractTask { public void getAllFinishTask() { List list = taskService.list(new LambdaQueryWrapper() .eq(SchBaseTask::getTask_status, TaskStatus.CREATED.getCode())); - if (ObjectUtil.isEmpty(list)) return; + if (ObjectUtil.isEmpty(list)) { + return; + } // 下发 this.renotifyAcs(list); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/constant/GeneralDefinition.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/constant/GeneralDefinition.java index 7c3d319..f3aac0f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/constant/GeneralDefinition.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/constant/GeneralDefinition.java @@ -90,7 +90,7 @@ public class GeneralDefinition { /** MES路径 */ public static final String MES_URL = "mes_url"; - // 完成/取消 + /取消 /** 任务完成 */ public static final String TASK_FINISH = "任务完成"; /** 任务取消 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java index d0f7550..60abfaa 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java @@ -126,11 +126,11 @@ // String startPoint = taskObj.getPoint_code1(); // 获取起点 // SchBasePoint startPointObj = pointService.getById(startPoint); // // 根据传来的类型去对任务进行操作 -// if (status.equals(TaskStatus.EXECUTING)) { // 执行中 +// if (status.equals(TaskStatus.EXECUTING)) { // taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); // taskObj.setRemark("执行中"); // } -// if (status.equals(TaskStatus.FINISHED)) { // 完成 +// if (status.equals(TaskStatus.FINISHED)) { // // 起点解锁 // if (ObjectUtil.isNotEmpty(startPointObj)) { // startPointObj.setIng_task_code(""); @@ -140,7 +140,7 @@ // taskObj.setTask_status(TaskStatus.FINISHED.getCode()); // taskObj.setRemark(GeneralDefinition.TASK_FINISH); // } -// if (status.equals(TaskStatus.CANCELED)) { // 取消 +// if (status.equals(TaskStatus.CANCELED)) { // // 起点解锁 // if (ObjectUtil.isNotEmpty(startPointObj)) { // startPointObj.setIng_task_code(""); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTKQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTKQKTask.java index f2b337d..8e49fc8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTKQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTKQKTask.java @@ -135,16 +135,16 @@ public class DTKQKTask extends AbstractTask { throw new BadRequestException("该任务已取消!"); } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java index 12e6810..059b8f4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java @@ -128,16 +128,16 @@ public class DTSKTask extends AbstractTask { throw new BadRequestException("该任务已取消!"); } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMLTask.java index 2b5ca6a..3255d39 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMLTask.java @@ -221,16 +221,16 @@ public class FJMLTask extends AbstractTask { } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java index f682176..3ac7e05 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java @@ -192,16 +192,16 @@ public class FJQKTask extends AbstractTask { } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java index 1cfe1d6..f6e94e3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java @@ -169,16 +169,16 @@ public class FJQLTask extends AbstractTask { throw new BadRequestException("该任务已取消!"); } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java index 7e77c72..9dfbe2b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java @@ -195,16 +195,16 @@ public class FJQZRKTask extends AbstractTask { } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java index fb678da..ac07e36 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java @@ -147,16 +147,16 @@ public class FJSKTask extends AbstractTask { throw new BadRequestException("该任务已取消!"); } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java index 702df8d..48fab20 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java @@ -180,16 +180,16 @@ public class FJSLTask extends AbstractTask { throw new BadRequestException("该任务已取消!"); } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/RGFJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/RGFJRKTask.java index 7bca9a0..5ccf512 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/RGFJRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/RGFJRKTask.java @@ -258,16 +258,16 @@ public class RGFJRKTask extends AbstractTask { } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java index 26b506a..2b629cd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java @@ -77,13 +77,13 @@ public class HNMLTask extends AbstractTask { if (taskObj.getTask_status().equals(TaskStatus.CANCELED.getCode())) { throw new BadRequestException(ExceptionConstant.THE_TASK_HAS_BEEN_COMPLETED); } - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); - } else if (status.equals(TaskStatus.FINISHED)) { // 完成 + } else if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); - } else if (status.equals(TaskStatus.CANCELED)) { // 取消 + } else if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java index d853dec..9610538 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java @@ -153,15 +153,15 @@ public class HNQKTask extends AbstractTask { throw new BadRequestException(ExceptionConstant.THE_TASK_HAS_BEEN_CANCELLED); } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYHCXMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYHCXMLTask.java index c2b957c..08081a3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYHCXMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYHCXMLTask.java @@ -178,16 +178,16 @@ public class CYHCXMLTask extends AbstractTask { } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java index 4da186f..3b0aa82 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java @@ -165,18 +165,18 @@ public class GZYQLTask extends AbstractTask { } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); // todo 记录入窑数据 wmsToMesService.reportGdyMaterialInfoIn(taskObj.getGroup_id()); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZMLTask.java index b8b181f..5171d29 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZMLTask.java @@ -190,16 +190,16 @@ public class YZMLTask extends AbstractTask { throw new BadRequestException("该任务已取消!"); } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java index ee2be04..8295f55 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java @@ -145,16 +145,16 @@ public class YZQKTask extends AbstractTask { throw new BadRequestException("该任务已取消!"); } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java index 7d03da2..32e010f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java @@ -199,16 +199,16 @@ public class YZQLTask extends AbstractTask { throw new BadRequestException("该任务已取消!"); } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java index 96facfe..e974b0a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java @@ -150,16 +150,16 @@ public class YZSKTask extends AbstractTask { throw new BadRequestException("该任务已取消!"); } // 根据传来的类型去对任务进行操作 - if (status.equals(TaskStatus.EXECUTING)) { // 执行中 + if (status.equals(TaskStatus.EXECUTING)) { taskObj.setTask_status(TaskStatus.EXECUTING.getCode()); taskObj.setRemark("执行中"); TaskUtils.setUpdateByAcs(taskObj); taskService.updateById(taskObj); } - if (status.equals(TaskStatus.FINISHED)) { // 完成 + if (status.equals(TaskStatus.FINISHED)) { this.finishTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } - if (status.equals(TaskStatus.CANCELED)) { // 取消 + if (status.equals(TaskStatus.CANCELED)) { this.cancelTask(taskObj, TaskFinishedTypeEnum.AUTO_ACS); } } diff --git a/lms/nladmin-ui/src/assets/images/logo2.png b/lms/nladmin-ui/src/assets/images/logo2.png new file mode 100644 index 0000000..a1ca19b Binary files /dev/null and b/lms/nladmin-ui/src/assets/images/logo2.png differ diff --git a/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue index bc2a53d..c331a60 100644 --- a/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -14,7 +14,7 @@ + + diff --git a/lms/nladmin-ui/src/views/wms/basedata/customer/mdCsCustomerbase.js b/lms/nladmin-ui/src/views/wms/basedata/customer/mdCsCustomerbase.js new file mode 100644 index 0000000..274dd9d --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/basedata/customer/mdCsCustomerbase.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/mdCsCustomerbase', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/mdCsCustomerbase/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/mdCsCustomerbase', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/lms/nladmin-ui/src/views/wms/ext/record/index.vue b/lms/nladmin-ui/src/views/wms/ext/record/index.vue index 3a0ebd1..d1f75ae 100644 --- a/lms/nladmin-ui/src/views/wms/ext/record/index.vue +++ b/lms/nladmin-ui/src/views/wms/ext/record/index.vue @@ -19,14 +19,34 @@ @keyup.enter.native="crud.toQuery" /> + + + + + + + + + + - + :value="item.value" + /> @@ -44,28 +64,28 @@ > - + - + - + - + - + - + - + @@ -186,7 +206,18 @@ export default { data() { return { permission: {}, - rules: {} + rules: {}, + interact_name_list: [], + http_codes: [ + { + 'label': '200', + 'value': '200' + }, + { + 'label': '400', + 'value': '400' + } + ] } }, computed: { @@ -219,10 +250,18 @@ export default { } } }, + created() { + this.getNameList() + }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 [CRUD.HOOK.beforeRefresh]() { return true + }, + getNameList() { + crudSysInteractRecord.getAllName().then((res) => { + this.interact_name_list = res + }) } } } diff --git a/lms/nladmin-ui/src/views/wms/ext/record/sysInteractRecord.js b/lms/nladmin-ui/src/views/wms/ext/record/sysInteractRecord.js index 9f6d776..8d66d13 100644 --- a/lms/nladmin-ui/src/views/wms/ext/record/sysInteractRecord.js +++ b/lms/nladmin-ui/src/views/wms/ext/record/sysInteractRecord.js @@ -23,5 +23,12 @@ export function edit(data) { data }) } +export function getAllName(params) { + return request({ + url: 'api/sysInteractRecord/getAllName', + method: 'get', + params + }) +} -export default { add, edit, del } +export default { add, edit, del, getAllName }