root/nd_hh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 客户信息管理

Browse Source
This commit is contained in:
liyongde
2023-12-13 14:27:19 +08:00
parent 4dd5dc8fcd
commit 067dbb27bd
49 changed files with 916 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DesUtil.java
View File

@@ -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);

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
View File

@@ -62,7 +62,8 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
String id = codeRuleMapper.selectOne(new LambdaQueryWrapper<SysCodeRule>().eq(SysCodeRule::getCode, code)).getId();
// 如果flag = 1就执行更新数据库的操作
String flag = (String) form.get("flag");
List<SysCodeRuleDetail> ruleDetails = codeRuleDetailMapper.selectList(new LambdaQueryWrapper<SysCodeRuleDetail>().eq(SysCodeRuleDetail::getCode_rule_id, id));
List<SysCodeRuleDetail> ruleDetails = codeRuleDetailMapper.selectList(new LambdaQueryWrapper<SysCodeRuleDetail>()
.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<SysCodeRuleMapper, SysCo
if (!nowDate.equals(currentValue)) {
isSame = false;
}
if (flag.equals("1")) {
if ("1".equals(flag)) {
detail.setInit_value(nowDate);
detail.setCurrent_value(nowDate);
}
@@ -92,7 +93,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
String numValue = "";
int step = Integer.parseInt(detail.getStep());
Long maxValue = Long.valueOf(detail.getMax_value());
if (!isSame && (Long.valueOf(detail.getCurrent_value()) + step) > 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<SysCodeRuleMapper, SysCo
value += fillchar;
}
value += numValue;
if (flag.equals("1")) {
if ("1".equals(flag)) {
if (!isSame) {
int initValue = Integer.parseInt(detail.getInit_value());
if (StrUtil.isEmpty((initValue + ""))) {
@@ -123,7 +124,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
}
}
demo += value;
if (flag.equals("1")) {
if ("1".equals(flag)) {
codeRuleDetailMapper.updateById(detail);
}
}

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java
View File

@@ -58,7 +58,9 @@ public class DasDeviceCheckRecordServiceImpl extends ServiceImpl<DasDeviceCheckR
@Override
public void update(DasDeviceCheckRecord entity) {
DasDeviceCheckRecord dto = dasDeviceCheckRecordMapper.selectById(entity.getRecord_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) {
throw new BadRequestException("被删除或无权限，操作失败!");
}
String now = DateUtil.now();
entity.setRecord_time(now);

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java
View File

@@ -59,7 +59,9 @@ public class DasDeviceOperationRecordServiceImpl extends ServiceImpl<DasDeviceOp
@Override
public void update(DasDeviceOperationRecord entity) {
DasDeviceOperationRecord dto = dasDeviceOperationRecordMapper.selectById(entity.getRecord_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) {
throw new BadRequestException("被删除或无权限，操作失败!");
}
entity.setRecord_time(DateUtil.now());
dasDeviceOperationRecordMapper.updateById(entity);

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java
View File

@@ -66,7 +66,9 @@ public class DasQualityInspectionServiceImpl extends ServiceImpl<DasQualityInspe
@Override
public void update(DasQualityInspection entity) {
DasQualityInspection dto = dasQualityInspectionMapper.selectById(entity.getInspection_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) {
throw new BadRequestException("被删除或无权限，操作失败!");
}
String now = DateUtil.now();
entity.setInspection_time(now);

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java
View File

@@ -55,7 +55,9 @@ public class MdBaseBrickInfoServiceImpl extends ServiceImpl<MdBaseBrickInfoMappe
@Override
public void update(MdBaseBrickInfo entity) {
MdBaseBrickInfo dto = mdBaseBrickInfoMapper.selectById(entity.getBrick_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) {
throw new BadRequestException("被删除或无权限，操作失败!");
}
mdBaseBrickInfoMapper.updateById(entity);
}

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java
View File

@@ -91,7 +91,9 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl<MdBaseClassstand
private void updateSubCnt(String parentClassId) {
MdBaseClassstandard classObject = mdBaseClassstandardMapper.selectById(parentClassId);
if (ObjectUtil.isEmpty(classObject)) return;
if (ObjectUtil.isEmpty(classObject)) {
return;
}
List<MdBaseClassstandard> classList = mdBaseClassstandardMapper
.selectList(new LambdaQueryWrapper<MdBaseClassstandard>().eq(MdBaseClassstandard::getParent_class_id, parentClassId));
int size = classList.size();
@@ -103,7 +105,9 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl<MdBaseClassstand
@Override
public void update(MdBaseClassstandard entity) {
MdBaseClassstandard dto = mdBaseClassstandardMapper.selectById(entity.getClass_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) {
throw new BadRequestException("被删除或无权限，操作失败!");
}
// 判断是否存在
MdBaseClassstandard mdBaseClassstandard = mdBaseClassstandardMapper
.selectOne(new LambdaQueryWrapper<MdBaseClassstandard>()

66
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/controller/MdCsCustomerbaseController.java Normal file
View File

@@ -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<Object> 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<Object> create(@Validated @RequestBody MdCsCustomerbase entity){
mdCsCustomerbaseService.create(entity);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PutMapping
@Log("修改客户信息管理")
@ApiOperation("修改客户信息管理")
//@SaCheckPermission("@el.check('mdCsCustomerbase:edit')")
public ResponseEntity<Object> update(@Validated @RequestBody MdCsCustomerbase entity){
mdCsCustomerbaseService.update(entity);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@Log("删除客户信息管理")
@ApiOperation("删除客户信息管理")
//@SaCheckPermission("@el.check('mdCsCustomerbase:del')")
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
mdCsCustomerbaseService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}

50
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/IMdCsCustomerbaseService.java Normal file
View File

@@ -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<MdCsCustomerbase> {
/**
* 查询数据分页
* @param whereJson 条件
* @param pageable 分页参数
* @return IPage<MdCsCustomerbase>
*/
IPage<MdCsCustomerbase> queryAll(Map whereJson, PageQuery pageable);
/**
* 创建
* @param entity /
*/
void create(MdCsCustomerbase entity);
/**
* 编辑
* @param entity /
*/
void update(MdCsCustomerbase entity);
/**
* 多选删除
* @param ids /
*/
void deleteAll(Set<String> ids);
/**
* 根据code获取客户信息
* @param code
* @return 客户信息
*/
MdCsCustomerbase getByCode(String code);
}

97
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dao/MdCsCustomerbase.java Normal file
View File

@@ -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;
}

12
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dao/mapper/MdCsCustomerbaseMapper.java Normal file
View File

@@ -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<MdCsCustomerbase> {
}

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dao/mapper/MdCsCustomerbaseMapper.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.database.customer.service.dao.mapper.MdCsCustomerbaseMapper">
</mapper>

85
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dto/MdCsCustomerbaseDto.java Normal file
View File

@@ -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;
}

12
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/dto/MdCsCustomerbaseQuery.java Normal file
View File

@@ -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<MdCsCustomerbase> {
}

98
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/customer/service/impl/MdCsCustomerbaseServiceImpl.java Normal file
View File

@@ -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<MdCsCustomerbaseMapper, MdCsCustomerbase> implements IMdCsCustomerbaseService {
@Autowired
private MdCsCustomerbaseMapper mdCsCustomerbaseMapper;
@Override
public IPage<MdCsCustomerbase> queryAll(Map whereJson, PageQuery page){
LambdaQueryWrapper<MdCsCustomerbase> lam = new LambdaQueryWrapper<>();
IPage<MdCsCustomerbase> 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<String> ids) {
// 真删除
mdCsCustomerbaseMapper.deleteBatchIds(ids);
}
@Override
public MdCsCustomerbase getByCode(String code) {
LambdaQueryWrapper<MdCsCustomerbase> lam = new QueryWrapper<MdCsCustomerbase>().lambda();
lam.eq(MdCsCustomerbase::getCust_code, code);
return mdCsCustomerbaseMapper.selectOne(lam);
}
}

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
View File

@@ -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<MdBaseMaterialMapper,
@Override
public void update(MdBaseMaterial entity) {
MdBaseMaterial dto = mdBaseMaterialMapper.selectById(entity.getMaterial_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) {
throw new BadRequestException("被删除或无权限，操作失败!");
}
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java
View File

@@ -41,7 +41,9 @@ public class AutoIssueWorkOrder {
// 查找该设备未生产的工单去下发
deviceCodes.forEach(s -> {
List<AcsWorkOrderVo> acsWorkOrderVoList = workorderService.getAcsWorkOrderVos(s);
if (acsWorkOrderVoList.size() == 0) return;
if (acsWorkOrderVoList.size() == 0) {
return;
}
AcsWorkOrderVo acsWorkOrderVo = acsWorkOrderVoList.get(0);
// 获取一个下发
List<AcsWorkOrderVo> list = new CopyOnWriteArrayList<>();

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -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) {

15
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java
View File

@@ -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<Object> 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<Object> 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<Object> 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<Object> delete(@RequestBody Set<String> ids) {
sysInteractRecordService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@GetMapping("/getAllName")
public ResponseEntity<Object> getAllName() {
return new ResponseEntity<>(sysInteractRecordService.getAllInteractName(), HttpStatus.OK);
}
}

34
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java
View File

@@ -11,14 +11,15 @@ 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<SysInteractRecord> {
/**
@@ -49,11 +50,14 @@ public interface ISysInteractRecordService extends IService<SysInteractRecord> {
/**
* 创建记录
* @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<SysInteractRecord> {
void saveRecord(AcsWorkOrderVo workorder, ResultForAcs resultForAcs, String direction);
/**
*
* @param name
* @param request
* @param response
* @param direction
* 保存对接记录
* @param name 保存对接记录
* @param request 请求参数
* @param response 响应参数，分类别
* @param direction 请求方向
*/
<K, V> 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<SysInteractRecord> {
* @param maxRowsToDelete 最大删除数
*/
void deleteByRows(Param maxRowsToKeep, Param maxRowsToDelete);
/**
* 获取所有标题
* @return List<String>
*/
List<String> getAllInteractName();
}

23
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java
View File

@@ -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<SysInteractRecord> {
/**
* 通过天数删除对接记录数据
* @param day 天数
*/
void deleteByDay(String day);
/**
* 删除行数
* @param maxRowsToKeep 保留行数
* @param maxRowsToDelete 删除行数
*/
void deleteByRows(String maxRowsToKeep, String maxRowsToDelete);
/**
* 获取所有对接名称
* @return List<String>
*/
List<String> getAllInteractName();
}

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml
View File

@@ -9,4 +9,11 @@
<delete id="deleteByRows">
CALL DeleteRowsIfNeeded(#{maxRowsToKeep}, #{maxRowsToDelete})
</delete>
<select id="getAllInteractName" resultType="java.lang.String">
SELECT
DISTINCT interact_name
FROM
`sys_interact_record`
ORDER BY interact_name
</select>
</mapper>

42
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java
View File

@@ -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<SysInteractRecordMapper, SysInteractRecord> implements ISysInteractRecordService {
@@ -42,10 +43,18 @@ public class SysInteractRecordServiceImpl extends ServiceImpl<SysInteractRecordM
@Override
public IPage<SysInteractRecord> 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<SysInteractRecord> 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<SysInteractRecordM
@Override
public void update(SysInteractRecord entity) {
SysInteractRecord dto = sysInteractRecordMapper.selectById(entity.getInteract_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) {
throw new BadRequestException("被删除或无权限，操作失败!");
}
sysInteractRecordMapper.updateById(entity);
}
@@ -118,25 +129,29 @@ public class SysInteractRecordServiceImpl extends ServiceImpl<SysInteractRecordM
entity.setDirection(direction);
entity.setRequest_param(JSONObject.toJSONString(request));
entity.setResponse_param(JSONObject.toJSONString(response));
if (response instanceof BaseResponse) { // acs请求wms的返回数据
// acs请求wms的返回数据
if (response instanceof BaseResponse) {
BaseResponse re = (BaseResponse) response;
entity.setCode(re.getCode());
entity.setMessage(re.getMessage());
entity.setIs_success(re.getCode() == HttpStatus.HTTP_OK);
}
if (response instanceof ResultForAcs) { // wms请求acs的返回数据
// wms请求acs的返回数据
if (response instanceof ResultForAcs) {
ResultForAcs re = (ResultForAcs) response;
entity.setCode(re.getStatus());
entity.setMessage(re.getMessage());
entity.setIs_success(re.getStatus() == HttpStatus.HTTP_OK);
}
if (response instanceof AcsResponse) { // wms请求acs的返回数据
// wms请求acs的返回数据
if (response instanceof AcsResponse) {
AcsResponse re = (AcsResponse) response;
entity.setCode(re.getCode());
entity.setMessage(re.getMessage());
entity.setIs_success(re.getCode() == HttpStatus.HTTP_OK);
}
if (response instanceof ResultForMes) { // wms请求mes的返回数据
// wms请求mes的返回数据
if (response instanceof ResultForMes) {
ResultForMes re = (ResultForMes) response;
entity.setCode(re.getStatus());
entity.setMessage(re.getMessage());
@@ -155,4 +170,9 @@ public class SysInteractRecordServiceImpl extends ServiceImpl<SysInteractRecordM
sysInteractRecordMapper.deleteByRows(maxRowsToKeep.getValue(), maxRowsToDelete.getValue());
}
@Override
public List<String> getAllInteractName() {
return sysInteractRecordMapper.getAllInteractName();
}
}

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
View File

@@ -168,7 +168,9 @@ public abstract class AbstractTask {
public void getAllFinishTask() {
List<SchBaseTask> list = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
.eq(SchBaseTask::getTask_status, TaskStatus.CREATED.getCode()));
if (ObjectUtil.isEmpty(list)) return;
if (ObjectUtil.isEmpty(list)) {
return;
}
// 下发
this.renotifyAcs(list);
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/constant/GeneralDefinition.java
View File

@@ -90,7 +90,7 @@ public class GeneralDefinition {
/** MES路径 */
public static final String MES_URL = "mes_url";
// 完成/取消
/取消
/** 任务完成 */
public static final String TASK_FINISH = "任务完成";
/** 任务取消 */

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/RYKQLTask.java
View File

@@ -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("");

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTKQKTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/DTSKTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMLTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/RGFJRKTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNQKTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYHCXMLTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZMLTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQLTask.java
View File

@@ -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);
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java
View File

@@ -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);
}
}

BIN
lms/nladmin-ui/src/assets/images/logo2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 120 KiB

2
lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue
View File

@@ -14,7 +14,7 @@
</template>
<script>
import Logo from '@/assets/images/logo.png'
import Logo from '@/assets/images/logo2.png'
import variables from '@/assets/styles/variables.scss'
export default {
name: 'SidebarLogo',

208
lms/nladmin-ui/src/views/wms/basedata/customer/index.vue Normal file
View File

@@ -0,0 +1,208 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="模糊查找">
<el-input
v-model="query.blurry"
clearable
placeholder="模糊查询"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation :crud="crud"/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="820px"
>
<el-form
ref="form"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:inline="true"
:model="form"
:rules="rules"
size="mini"
label-width="135px"
label-suffix=":"
>
<el-form-item label="客户编码">
<el-input :disabled="crud.status.edit > 0" v-model="form.cust_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="客户名称 ">
<el-input v-model="form.cust_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="法人代表">
<el-input v-model="form.jurid_name" style="width: 240px;" />
</el-form-item>
<el-form-item label="税务登记号">
<el-input v-model="form.tax_no" style="width: 240px;" />
</el-form-item>
<el-form-item label="工商注册号">
<el-input v-model="form.register_no" style="width: 240px;" />
</el-form-item>
<el-form-item label="经营许可证号">
<el-input v-model="form.manage_lice_no" style="width: 240px;" />
</el-form-item>
<el-form-item v-if="false" label="营业执照">
<el-input v-model="form.busi_char_name" style="width: 240px;" />
</el-form-item>
<!-- <el-form-item label="行政区划">-->
<!-- <el-input v-model="form.area_id" style="width: 240px;" />-->
<!-- </el-form-item>-->
<el-form-item label="邮政编码">
<el-input v-model="form.zip_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="公司电话">
<el-input v-model="form.corp_tele_no" style="width: 240px;" />
</el-form-item>
<el-form-item label="公司地址">
<el-input v-model="form.corp_address" style="width: 240px;" />
</el-form-item>
<el-form-item label="是否启用">
<el-radio-group v-model="form.is_used" style="width: 240px">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="外部标识">
<el-input v-model="form.ext_id" style="width: 240px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" :rows="3" type="textarea" style="width: 240px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="cust_code" label="客户编码" :min-width="flexWidth('cust_code',crud.data,'客户编码')" />
<el-table-column prop="cust_name" label="客户名称 " :min-width="flexWidth('cust_name',crud.data,'客户名称 ')" />
<el-table-column prop="jurid_name" label="法人代表" :min-width="flexWidth('jurid_name',crud.data,'法人代表')" />
<el-table-column prop="tax_no" label="税务登记号" :min-width="flexWidth('tax_no',crud.data,'税务登记号')" />
<el-table-column prop="register_no" label="工商注册号" :min-width="flexWidth('register_no',crud.data,'工商注册号')" />
<el-table-column prop="manage_lice_no" label="经营许可证号" :min-width="flexWidth('manage_lice_no',crud.data,'经营许可证号')" />
<!-- <el-table-column prop="area_id" label="行政区划" :min-width="flexWidth('area_id',crud.data,'行政区划')" />-->
<el-table-column prop="zip_code" label="邮政编码" :min-width="flexWidth('zip_code',crud.data,'邮政编码')" />
<el-table-column prop="corp_tele_no" label="公司电话" :min-width="flexWidth('corp_tele_no',crud.data,'公司电话')" />
<el-table-column prop="corp_address" label="公司地址" :min-width="flexWidth('corp_address',crud.data,'公司地址')" />
<el-table-column prop="create_name" label="创建人姓名" :min-width="flexWidth('create_name',crud.data,'创建人姓名')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column prop="is_used_time" label="启用时间" :min-width="flexWidth('is_used_time',crud.data,'启用时间')" />
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')" />
<!-- <el-table-column prop="is_delete" label="是否删除" :min-width="flexWidth('is_delete',crud.data,'是否删除')" />-->
<el-table-column prop="ext_id" label="外部标识" :min-width="flexWidth('ext_id',crud.data,'外部标识')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="update_id" label="修改人" :min-width="flexWidth('update_id',crud.data,'修改人')" />
<el-table-column prop="update_name" label="修改人姓名" :min-width="flexWidth('update_name',crud.data,'修改人姓名')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
</div>
</div>
</template>
<script>
import crudMdCsCustomerbase from './mdCsCustomerbase'
import CRUD, {crud, form, header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = {
cust_id: null,
cust_code: null,
cust_name: null,
jurid_name: null,
tax_no: null,
register_no: null,
manage_lice_no: null,
busi_char_name: null,
area_id: null,
zip_code: null,
corp_tele_no: null,
corp_address: null,
create_id: null,
create_name: null,
create_time: null,
update_time: null,
is_used_time: null,
is_used: false,
is_delete: null,
ext_id: null,
remark: null,
class_id: null,
update_id: null,
update_name: null
}
export default {
name: 'Customerbase',
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '客户信息管理',
url: 'api/mdCsCustomerbase',
idField: 'cust_id',
sort: 'cust_id,desc',
crudMethod: { ...crudMdCsCustomerbase },
optShow: {
add: true,
edit: true,
del: true,
download: false,
reset: true
}
})
},
data() {
return {
permission: {
},
rules: {
}
}
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
}
}
}
</script>
<style scoped>
</style>

27
lms/nladmin-ui/src/views/wms/basedata/customer/mdCsCustomerbase.js Normal file
View File

@@ -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 }

63
lms/nladmin-ui/src/views/wms/ext/record/index.vue
View File

@@ -19,14 +19,34 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="标题">
<el-select v-model="query.interact_name" placeholder="标题" clearable @change="crud.toQuery()">
<el-option
v-for="item in interact_name_list"
:key="item"
:label="item"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="响应编码">
<el-select v-model="query.http_code" placeholder="响应编码" clearable>
<el-option
v-for="item in http_codes"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="请求方向">
<el-select v-model="query.interact_direction" placeholder="请求方向" clearable>
<el-option
v-for="item in dict.interact_direction"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation />
@@ -44,28 +64,28 @@
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="对接名称">
<el-input v-model="form.interact_name" style="width: 370px;" disabled/>
<el-input v-model="form.interact_name" style="width: 370px;" disabled />
</el-form-item>
<el-form-item label="响应编码">
<el-input v-model="form.code" style="width: 370px;" disabled/>
<el-input v-model="form.code" style="width: 370px;" disabled />
</el-form-item>
<el-form-item label="响应信息">
<el-input v-model="form.message" style="width: 370px;" disabled/>
<el-input v-model="form.message" style="width: 370px;" disabled />
</el-form-item>
<el-form-item label="请求报文">
<el-input v-model="formattedRequestParam" :autosize="{ minRows: 3 }" type="textarea" style="width: 370px;"/>
<el-input v-model="formattedRequestParam" :autosize="{ minRows: 3 }" type="textarea" style="width: 370px;" />
</el-form-item>
<el-form-item label="响应结果">
<el-input v-model="formattedResponseParam" :autosize="{ minRows: 3 }" type="textarea" style="width: 370px;" disabled/>
<el-input v-model="formattedResponseParam" :autosize="{ minRows: 3 }" type="textarea" style="width: 370px;" disabled />
</el-form-item>
<el-form-item label="记录时间">
<el-input v-model="form.record_time" style="width: 370px;" disabled/>
<el-input v-model="form.record_time" style="width: 370px;" disabled />
</el-form-item>
<el-form-item label="请求方向">
<!-- <el-input v-model="form.direction" style="width: 370px;" disabled/>-->
<!-- <el-input v-model="form.direction" style="width: 370px;" disabled/>-->
<el-select
disabled
v-model="form.direction"
disabled
size="mini"
placeholder="点位状态"
class="filter-item"
@@ -126,7 +146,7 @@
</el-table-column>
<el-table-column prop="is_success" label="请求状态" :min-width="flexWidth('is_success',crud.data,'是否成功')">
<template slot-scope="scope">
{{ scope.row.is_success ? '成功' : '失败'}}
{{ scope.row.is_success ? '成功' : '失败' }}
</template>
</el-table-column>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
@@ -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
})
}
}
}

9
lms/nladmin-ui/src/views/wms/ext/record/sysInteractRecord.js
View File

@@ -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 }