diff --git a/lms/nladmin-system/doc/wms.xls b/lms/nladmin-system/doc/wms.xls index a27399d..8283c57 100644 Binary files a/lms/nladmin-system/doc/wms.xls and b/lms/nladmin-system/doc/wms.xls differ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java index e1a0029..9760c7b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java @@ -21,9 +21,6 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.exception.EntityExistException; import org.nl.common.exception.EntityNotFoundException; import org.nl.common.utils.ThrowableUtil; -import org.nl.system.service.notice.ISysNoticeService; -import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.MethodArgumentNotValidException; @@ -42,14 +39,10 @@ import static org.springframework.http.HttpStatus.NOT_FOUND; @RestControllerAdvice public class GlobalExceptionHandler { - @Autowired - private ISysNoticeService noticeService; - @ExceptionHandler(NullPointerException.class) public ResponseEntity handleNullPointerException(NullPointerException ex) { // 在这里处理空指针异常 - noticeService.createNotice("异常信息：" + ex.getMessage(), "空指针异常发", - NoticeTypeEnum.EXCEPTION.getCode()); + log.error(ThrowableUtil.getStackTrace(ex)); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("空指针异常发生了"); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java index f2fe28c..2cc9952 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java @@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.secure.SaSecureUtil; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -19,6 +20,7 @@ import org.nl.system.service.secutiry.dto.AuthUserDto; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -35,7 +37,7 @@ import java.util.List; */ @Slf4j @RestController -@RequestMapping("/api/pda") +@RequestMapping("/mobile/auth") @Api(tags = "手持：系统授权接口") public class MobileAuthorizationController { @Autowired @@ -45,14 +47,14 @@ public class MobileAuthorizationController { @ApiOperation("登录授权") @PostMapping(value = "/login") @SaIgnore - public JSONObject login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception { + public ResponseEntity login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception { // 密码解密 - 前端的加密规则: encrypt（根据实际更改） String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, authUser.getPassword()); // 校验数据库 // 根据用户名查询，在比对密码 SysUser userInfo = userService.getOne(new LambdaQueryWrapper() - .eq(SysUser::getUsername, authUser.getUsername())); // 拿不到已经抛出异常 - if (!userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, "salt"))) { // 这里需要密码加密 + .eq(SysUser::getUsername, authUser.getUsername())); // 拿到多个已经抛出异常 + if (ObjectUtil.isEmpty(userInfo) || !userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, "salt"))) { // 这里需要密码加密 throw new BadRequestException("账号或密码错误！"); } // 获取权限列表 - 登录查找权限 @@ -85,6 +87,6 @@ public class MobileAuthorizationController { put("user", jsonObject); }}; - return authInfo; + return ResponseEntity.ok(authInfo); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/controller/DasDeviceCheckRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/controller/DasDeviceCheckRecordController.java new file mode 100644 index 0000000..92e018c --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/controller/DasDeviceCheckRecordController.java @@ -0,0 +1,66 @@ +package org.nl.wms.das.devicecheck.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.das.devicecheck.service.IDasDeviceCheckRecordService; +import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord; +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-08-01 +**/ +@Slf4j +@RestController +@Api(tags = "设备点检功能管理") +@RequestMapping("/api/dasDeviceCheckRecord") +public class DasDeviceCheckRecordController { + + @Autowired + private IDasDeviceCheckRecordService dasDeviceCheckRecordService; + + @GetMapping + @Log("查询设备点检功能") + @ApiOperation("查询设备点检功能") + //@SaCheckPermission("@el.check('dasDeviceCheckRecord:list')") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(dasDeviceCheckRecordService.queryAll(whereJson,page)),HttpStatus.OK); + } + + @PostMapping + @Log("新增设备点检功能") + @ApiOperation("新增设备点检功能") + //@SaCheckPermission("@el.check('dasDeviceCheckRecord:add')") + public ResponseEntity create(@Validated @RequestBody DasDeviceCheckRecord entity){ + dasDeviceCheckRecordService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改设备点检功能") + @ApiOperation("修改设备点检功能") + //@SaCheckPermission("@el.check('dasDeviceCheckRecord:edit')") + public ResponseEntity update(@Validated @RequestBody DasDeviceCheckRecord entity){ + dasDeviceCheckRecordService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除设备点检功能") + @ApiOperation("删除设备点检功能") + //@SaCheckPermission("@el.check('dasDeviceCheckRecord:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + dasDeviceCheckRecordService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/IDasDeviceCheckRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/IDasDeviceCheckRecordService.java new file mode 100644 index 0000000..7cbc002 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/IDasDeviceCheckRecordService.java @@ -0,0 +1,43 @@ +package org.nl.wms.das.devicecheck.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.das.devicecheck.service.dao.DasDeviceCheckRecord; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务接口 +* @author lyd +* @date 2023-08-01 +**/ +public interface IDasDeviceCheckRecordService extends IService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 创建 + * @param entity / + */ + void create(DasDeviceCheckRecord entity); + + /** + * 编辑 + * @param entity / + */ + void update(DasDeviceCheckRecord entity); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Set ids); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/DasDeviceCheckRecord.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/DasDeviceCheckRecord.java new file mode 100644 index 0000000..c64cce2 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/DasDeviceCheckRecord.java @@ -0,0 +1,46 @@ +package org.nl.wms.das.devicecheck.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-08-01 +**/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("das_device_check_record") +public class DasDeviceCheckRecord implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "record_id", type = IdType.NONE) + @ApiModelProperty(value = "记录标识") + private String record_id; + + @ApiModelProperty(value = "账号") + private String username; + + @ApiModelProperty(value = "用户名") + private String person_name; + + @ApiModelProperty(value = "记录时间") + private String record_time; + + @ApiModelProperty(value = "设备号") + private String device_code; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "点检状态") + private String check_status; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.java new file mode 100644 index 0000000..f635bf3 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.java @@ -0,0 +1,12 @@ +package org.nl.wms.das.devicecheck.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord; + +/** +* @author lyd +* @date 2023-08-01 +**/ +public interface DasDeviceCheckRecordMapper extends BaseMapper { + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.xml new file mode 100644 index 0000000..a36057d --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordDto.java new file mode 100644 index 0000000..6352d27 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordDto.java @@ -0,0 +1,34 @@ +package org.nl.wms.das.devicecheck.service.dto; + +import lombok.Data; +import java.io.Serializable; + +/** +* @description / +* @author lyd +* @date 2023-08-01 +**/ +@Data +public class DasDeviceCheckRecordDto implements Serializable { + + /** 记录标识 */ + private String record_id; + + /** 账号 */ + private String username; + + /** 用户名 */ + private String person_name; + + /** 记录时间 */ + private String record_time; + + /** 设备号 */ + private String device_code; + + /** 备注 */ + private String remark; + + /** 点检状态 */ + private String check_status; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordQuery.java new file mode 100644 index 0000000..10a5b03 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.das.devicecheck.service.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord; + +/** +* @author lyd +* @date 2023-08-01 +**/ +public class DasDeviceCheckRecordQuery extends BaseQuery { + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/impl/DasDeviceCheckRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/impl/DasDeviceCheckRecordServiceImpl.java new file mode 100644 index 0000000..618345b --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/impl/DasDeviceCheckRecordServiceImpl.java @@ -0,0 +1,75 @@ +package org.nl.wms.das.devicecheck.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.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.system.service.user.ISysUserService; +import org.nl.system.service.user.dao.SysUser; +import org.nl.wms.das.devicecheck.service.IDasDeviceCheckRecordService; +import org.nl.wms.das.devicecheck.service.dao.mapper.DasDeviceCheckRecordMapper; +import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord; +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-08-01 +**/ +@Slf4j +@Service +public class DasDeviceCheckRecordServiceImpl extends ServiceImpl implements IDasDeviceCheckRecordService { + + @Autowired + private DasDeviceCheckRecordMapper dasDeviceCheckRecordMapper; + @Autowired + private ISysUserService userService; + + @Override + public IPage queryAll(Map whereJson, PageQuery page){ + LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + dasDeviceCheckRecordMapper.selectPage(pages, lam); + return pages; + } + + @Override + public void create(DasDeviceCheckRecord entity) { + SysUser sysUser = userService.getOne(new LambdaQueryWrapper() + .eq(SysUser::getUsername, entity.getUsername())); + String now = DateUtil.now(); + entity.setRecord_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setRecord_time(now); + entity.setPerson_name(sysUser.getPerson_name()); + dasDeviceCheckRecordMapper.insert(entity); + } + + @Override + public void update(DasDeviceCheckRecord entity) { + DasDeviceCheckRecord dto = dasDeviceCheckRecordMapper.selectById(entity.getRecord_id()); + if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); + String now = DateUtil.now(); + entity.setRecord_time(now); + + dasDeviceCheckRecordMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + dasDeviceCheckRecordMapper.deleteBatchIds(ids); + } + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/controller/DasQualityInspectionController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/controller/DasQualityInspectionController.java new file mode 100644 index 0000000..d24082c --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/controller/DasQualityInspectionController.java @@ -0,0 +1,66 @@ +package org.nl.wms.das.inspection.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.das.inspection.service.IDasQualityInspectionService; +import org.nl.wms.das.inspection.service.dao.DasQualityInspection; +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-08-01 +**/ +@Slf4j +@RestController +@Api(tags = "质检记录管理") +@RequestMapping("/api/dasQualityInspection") +public class DasQualityInspectionController { + + @Autowired + private IDasQualityInspectionService dasQualityInspectionService; + + @GetMapping + @Log("查询质检记录") + @ApiOperation("查询质检记录") + //@SaCheckPermission("@el.check('dasQualityInspection:list')") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(dasQualityInspectionService.queryAll(whereJson,page)),HttpStatus.OK); + } + + @PostMapping + @Log("新增质检记录") + @ApiOperation("新增质检记录") + //@SaCheckPermission("@el.check('dasQualityInspection:add')") + public ResponseEntity create(@Validated @RequestBody DasQualityInspection entity){ + dasQualityInspectionService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改质检记录") + @ApiOperation("修改质检记录") + //@SaCheckPermission("@el.check('dasQualityInspection:edit')") + public ResponseEntity update(@Validated @RequestBody DasQualityInspection entity){ + dasQualityInspectionService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除质检记录") + @ApiOperation("删除质检记录") + //@SaCheckPermission("@el.check('dasQualityInspection:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + dasQualityInspectionService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/IDasQualityInspectionService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/IDasQualityInspectionService.java new file mode 100644 index 0000000..2ca128a --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/IDasQualityInspectionService.java @@ -0,0 +1,46 @@ +package org.nl.wms.das.inspection.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.das.inspection.service.dao.DasQualityInspection; +import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest; + +import java.util.Map; +import java.util.Set; + +/** +* @description 服务接口 +* @author lyd +* @date 2023-08-01 +**/ +public interface IDasQualityInspectionService extends IService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 创建 + * @param entity / + */ + void create(DasQualityInspection entity); + + /** + * 编辑 + * @param entity / + */ + void update(DasQualityInspection entity); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(Set ids); + + void createByAcs(ApplyTaskRequest applyTaskRequest); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/DasQualityInspection.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/DasQualityInspection.java new file mode 100644 index 0000000..340fa07 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/DasQualityInspection.java @@ -0,0 +1,46 @@ +package org.nl.wms.das.inspection.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-08-01 +**/ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("das_quality_inspection") +public class DasQualityInspection implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "inspection_id", type = IdType.NONE) + @ApiModelProperty(value = "检测标识") + private String inspection_id; + + @ApiModelProperty(value = "质检时间") + private String inspection_time; + + @ApiModelProperty(value = "半成品物料") + private String half_material_code; + + @ApiModelProperty(value = "托盘号") + private String vehicle_code; + + @ApiModelProperty(value = "数量") + private String material_qty; + + @ApiModelProperty(value = "拆垛工位") + private String point_code; + + @ApiModelProperty(value = "分拣工单") + private String workorder_code; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/mapper/DasQualityInspectionMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/mapper/DasQualityInspectionMapper.java new file mode 100644 index 0000000..cfbc34d --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/mapper/DasQualityInspectionMapper.java @@ -0,0 +1,12 @@ +package org.nl.wms.das.inspection.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.das.inspection.service.dao.DasQualityInspection; + +/** +* @author lyd +* @date 2023-08-01 +**/ +public interface DasQualityInspectionMapper extends BaseMapper { + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/mapper/DasQualityInspectionMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/mapper/DasQualityInspectionMapper.xml new file mode 100644 index 0000000..f1adbe6 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/mapper/DasQualityInspectionMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionDto.java new file mode 100644 index 0000000..ce8112c --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionDto.java @@ -0,0 +1,34 @@ +package org.nl.wms.das.inspection.service.dto; + +import lombok.Data; +import java.io.Serializable; + +/** +* @description / +* @author lyd +* @date 2023-08-01 +**/ +@Data +public class DasQualityInspectionDto implements Serializable { + + /** 检测标识 */ + private String inspection_id; + + /** 质检时间 */ + private String inspection_time; + + /** 半成品物料 */ + private String half_material_code; + + /** 托盘号 */ + private String vehicle_code; + + /** 数量 */ + private String material_qty; + + /** 拆垛工位 */ + private String point_code; + + /** 分拣工单 */ + private String workorder_code; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionQuery.java new file mode 100644 index 0000000..f179558 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionQuery.java @@ -0,0 +1,12 @@ +package org.nl.wms.das.inspection.service.dto; + +import org.nl.common.domain.query.BaseQuery; +import org.nl.wms.das.inspection.service.dao.DasQualityInspection; + +/** +* @author lyd +* @date 2023-08-01 +**/ +public class DasQualityInspectionQuery extends BaseQuery { + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java new file mode 100644 index 0000000..6241bdb --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java @@ -0,0 +1,115 @@ +package org.nl.wms.das.inspection.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.das.inspection.service.IDasQualityInspectionService; +import org.nl.wms.das.inspection.service.dao.mapper.DasQualityInspectionMapper; +import org.nl.wms.das.inspection.service.dao.DasQualityInspection; +import org.nl.wms.database.material.service.IMdBaseMaterialService; +import org.nl.wms.database.material.service.dao.MdBaseMaterial; +import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest; +import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService; +import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; +import org.nl.wms.sch.point.service.ISchBasePointService; +import org.nl.wms.sch.point.service.dao.SchBasePoint; +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-08-01 +**/ +@Slf4j +@Service +public class DasQualityInspectionServiceImpl extends ServiceImpl implements IDasQualityInspectionService { + + @Autowired + private DasQualityInspectionMapper dasQualityInspectionMapper; + @Autowired + private ISchBasePointService pointService; + @Autowired + private IPdmBdWorkorderService workorderService; + @Autowired + private IMdBaseMaterialService materialService; + + @Override + public IPage queryAll(Map whereJson, PageQuery page){ + LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + dasQualityInspectionMapper.selectPage(pages, lam); + return pages; + } + + @Override + public void create(DasQualityInspection entity) { + String now = DateUtil.now(); + entity.setInspection_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setInspection_time(now); + dasQualityInspectionMapper.insert(entity); + } + + @Override + public void update(DasQualityInspection entity) { + DasQualityInspection dto = dasQualityInspectionMapper.selectById(entity.getInspection_id()); + if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); + String now = DateUtil.now(); + entity.setInspection_time(now); + + dasQualityInspectionMapper.updateById(entity); + } + + @Override + public void deleteAll(Set ids) { + // 真删除 + dasQualityInspectionMapper.deleteBatchIds(ids); + } + + @Override + public void createByAcs(ApplyTaskRequest applyTaskRequest) { + String deviceCode = applyTaskRequest.getDevice_code(); + if (ObjectUtil.isEmpty(deviceCode)) { + throw new BadRequestException("质检记录-拆垛工位不能为空"); + } + String vehicleCode = applyTaskRequest.getVehicle_code(); + if (ObjectUtil.isEmpty(vehicleCode)) { + throw new BadRequestException("质检记录-载具编码不能为空"); + } + LambdaQueryWrapper pointLam = new QueryWrapper().lambda(); + pointLam.eq(SchBasePoint::getPoint_code, deviceCode); + SchBasePoint one = pointService.getOne(pointLam); // 拆垛工位 + // 生产中的工单， 如果ACS能给就直接查 + PdmBdWorkorder deviceProductionTask = workorderService.getDeviceProductionTask(one.getParent_point_code()); + if (ObjectUtil.isEmpty(deviceProductionTask)) { + throw new BadRequestException("质检记录-设备[" + one.getParent_point_code() + "]未存在生产中的工单"); + } + MdBaseMaterial baseMaterial = materialService.getById(deviceProductionTask.getMaterial_id()); + if (ObjectUtil.isEmpty(baseMaterial)) { + throw new BadRequestException("质检记录-物料ID[" + deviceProductionTask.getMaterial_id() + "]不存在"); + } + DasQualityInspection dasQualityInspection = new DasQualityInspection(); + dasQualityInspection.setInspection_id(IdUtil.getSnowflake(1,1).nextIdStr()); + dasQualityInspection.setPoint_code(deviceCode); + dasQualityInspection.setInspection_time(DateUtil.now()); + dasQualityInspection.setVehicle_code(vehicleCode); + dasQualityInspection.setMaterial_qty("1"); + dasQualityInspection.setHalf_material_code(baseMaterial.getHalf_material_code()); + dasQualityInspection.setWorkorder_code(deviceProductionTask.getWorkorder_code()); + dasQualityInspectionMapper.insert(dasQualityInspection); + } + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java index 29a2b3a..99a3814 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import org.nl.wms.ext.acs.service.dto.ResultForAcs; import org.nl.wms.ext.acs.service.dto.to.acs.PutActionRequest; 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; @@ -20,7 +21,7 @@ public interface WmsToAcsService { * @param workorder * @return */ - ResultForAcs order(PdmBdWorkorder workorder); + ResultForAcs order(AcsWorkOrderVo workorder); /** * 下发信号 - 覆膜机释放托盘 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 dbdf01a..d4daffd 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 @@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; import org.nl.config.MapOf; import org.nl.system.service.notice.ISysNoticeService; +import org.nl.wms.das.inspection.service.IDasQualityInspectionService; import org.nl.wms.database.brick.service.IMdBaseBrickInfoService; import org.nl.wms.database.material.service.IMdBaseMaterialService; import org.nl.wms.database.material.service.dao.MdBaseMaterial; @@ -98,6 +99,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Autowired private RedissonClient redissonClient; @Autowired + private IDasQualityInspectionService qualityInspectionService; + @Autowired private IPdmBdMaterialResidueService materialResidueService; @Autowired private IPdmBdVehicleBindingService vehicleBindingService; @@ -316,6 +319,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return requestNo; } + /** 质检记录 */ + public BaseResponse qualityInspection(JSONObject param) { + ApplyTaskRequest applyTaskRequest = param.toJavaObject(ApplyTaskRequest.class); + // 记录质检信息 + qualityInspectionService.createByAcs(applyTaskRequest); + return BaseResponse.responseOk(applyTaskRequest.getRequestNo()); + } + /** 分拣 - 记录钢托与木托的绑定 */ public BaseResponse recordVehicleBiding(JSONObject param) { FeedBackSplitPalletStationRequest request = param.toJavaObject(FeedBackSplitPalletStationRequest.class); @@ -394,7 +405,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } PdmBdWorkorder bdWorkorder = workorderService.getByCode(workorderCode); if (bdWorkorder == null) { - return BaseResponse.responseError(requestNo, "物料信息为空!"); + return BaseResponse.responseError(requestNo, "未找到工单号[" + workorderCode + "]的记录!"); } bdWorkorder.setWorkorder_status(WorkOrderStatusEnum.PRODUCING.getCode()); bdWorkorder.setRealproducestart_date(DateUtil.now()); @@ -412,7 +423,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } PdmBdWorkorder bdWorkorder = workorderService.getByCode(workorderCode); if (bdWorkorder == null) { - return BaseResponse.responseError(requestNo, "物料信息为空!"); + return BaseResponse.responseError(requestNo, "未找到工单号[" + workorderCode + "]的记录!"); } bdWorkorder.setWorkorder_status(WorkOrderStatusEnum.COMPLETE.getCode()); bdWorkorder.setRealproduceend_date(DateUtil.now()); @@ -528,6 +539,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Deprecated @Transactional(rollbackFor = Exception.class) public BaseResponse pressRequestMaterial(JSONObject param) { // （公共接口进来）只是给我一个下料位（中间位置） + // todo: 换成acs请求，修改设备点位为空位，并且更新时间 String requestNo = param.getString("requestNo"); // 压机、原材料物料（混碾）、压机工单、叫料时间 String deviceCode = param.getString("device_code");// 几号压机下料位 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index 1447c2d..4ea4171 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -8,6 +8,7 @@ import org.nl.wms.ext.acs.service.dto.ResultForAcs; import org.nl.wms.ext.acs.service.dto.to.acs.PutActionRequest; import org.nl.wms.ext.record.service.ISysInteractRecordService; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; +import org.nl.wms.pdm.workorder.service.dao.vo.AcsWorkOrderVo; import org.nl.wms.sch.task_manage.GeneralDefinition; import org.nl.wms.sch.task_manage.task.AcsUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -15,6 +16,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; /** * @Author: lyd @@ -27,9 +29,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { @Autowired private ISysInteractRecordService interactRecordService; @Override - public ResultForAcs order(PdmBdWorkorder workorder) { + public ResultForAcs order(AcsWorkOrderVo workorder) { String api = "api/wms/order"; - List list = new ArrayList<>(); + List list = new CopyOnWriteArrayList<>(); list.add(workorder); ResultForAcs resultForAcs = ResultForAcs.requestOk(); try { 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 fe92fdf..027a36f 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 @@ -8,6 +8,7 @@ import org.nl.wms.ext.acs.service.dto.ResultForAcs; import org.nl.wms.ext.acs.service.dto.to.BaseResponse; 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.Map; import java.util.Set; @@ -50,5 +51,20 @@ public interface ISysInteractRecordService extends IService { */ void saveRecord(Object request, BaseResponse response, String direction); - void saveRecord(PdmBdWorkorder workorder, ResultForAcs resultForAcs, String lmsAcs); + /** + * + * @param workorder + * @param resultForAcs + * @param direction + */ + void saveRecord(AcsWorkOrderVo workorder, ResultForAcs resultForAcs, String direction); + + /** + * + * @param code + * @param request + * @param response + * @param direction + */ + void saveRecord(String code, Object request, T response, String direction); } 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 3ced7c8..59f8dab 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 @@ -17,9 +17,11 @@ import org.nl.wms.ext.record.service.ISysInteractRecordService; import org.nl.wms.ext.record.service.dao.mapper.SysInteractRecordMapper; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.Map; import java.util.Set; @@ -71,7 +73,7 @@ public class SysInteractRecordServiceImpl extends ServiceImpl void saveRecord(String code, Object request, T response, String direction) { + SysInteractRecord entity = new SysInteractRecord(); + entity.setInteract_id(IdUtil.getSnowflake(1, 1).nextIdStr()); + entity.setRecord_time(DateUtil.now()); + entity.setDirection(direction); + entity.setRequest_param(JSONObject.toJSONString(request)); + entity.setResponse_param(JSONObject.toJSONString(response)); + if (response instanceof BaseResponse) { + BaseResponse re = (BaseResponse) response; + entity.setInteract_code(re.getRequestNo()); + entity.setCode(re.getCode()); + entity.setMessage(re.getMessage()); + entity.setIs_success(re.getCode() == HttpStatus.HTTP_OK); + } + if (response instanceof ResultForAcs) { + ResultForAcs re = (ResultForAcs) response; + entity.setInteract_code(IdUtil.simpleUUID()); // todo: 暂定 + entity.setCode(re.getStatus()); + entity.setMessage(re.getMessage()); + entity.setIs_success(re.getStatus() == HttpStatus.HTTP_OK); + } + sysInteractRecordMapper.insert(entity); + } + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java new file mode 100644 index 0000000..a96648a --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java @@ -0,0 +1,60 @@ +package org.nl.wms.pda.controller; + +import cn.dev33.satoken.annotation.SaIgnore; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.das.devicecheck.service.IDasDeviceCheckRecordService; +import org.nl.wms.das.devicecheck.service.dao.DasDeviceCheckRecord; +import org.nl.wms.pda.service.PdaService; +import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Author: lyd + * @Description: 手持接口 + * @Date: 2023/8/1 + */ +@Slf4j +@RestController +@Api(tags = "手持接口") +@RequestMapping("/api/pda") +public class PdaController { + @Autowired + private IDasDeviceCheckRecordService deviceCheckRecordService; + @Autowired + private PdaService pdaService; + @PostMapping("/deviceCheck/verify") + @Log("设备点检") + @ApiOperation("设备点检") + @SaIgnore + public ResponseEntity deviceCheck(@Validated @RequestBody DasDeviceCheckRecord entity){ + deviceCheckRecordService.create(entity); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/deviceCheck/deviceInfo") + @Log("设备下拉框数据") + @ApiOperation("设备下拉框数据") + @SaIgnore + public ResponseEntity deviceInfo(){ + return new ResponseEntity<>(pdaService.getDeviceInfo(), HttpStatus.OK); + } + + @PostMapping("/deviceCheck/deviceStatus") + @Log("设备状态下拉框数据") + @ApiOperation("设备状态下拉框数据") + @SaIgnore + public ResponseEntity deviceStatus(){ + return new ResponseEntity<>(pdaService.getDeviceStatus(), HttpStatus.OK); + } + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java new file mode 100644 index 0000000..5647591 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java @@ -0,0 +1,16 @@ +package org.nl.wms.pda.service; + +import org.nl.wms.pda.service.dao.vo.DropdownListVo; + +import java.util.List; + +/** + * @Author: lyd + * @Description: + * @Date: 2023/8/1 + */ +public interface PdaService { + List getDeviceInfo(); + + List getDeviceStatus(); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java new file mode 100644 index 0000000..8ebdfc7 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.pda.service.dao.mapper; + +import org.nl.wms.pda.service.dao.vo.DropdownListVo; + +import java.util.List; + +/** + * @Author: lyd + * @Description: 手持mapper接口 + * @Date: 2023/8/1 + */ +public interface PdaMapper { + List getDeviceInfo(); + + List getDictByCode(String code); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml new file mode 100644 index 0000000..c85c4ce --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/DropdownListVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/DropdownListVo.java new file mode 100644 index 0000000..b3fb6c5 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/DropdownListVo.java @@ -0,0 +1,16 @@ +package org.nl.wms.pda.service.dao.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author: lyd + * @Description: 下拉框数据 + * @Date: 2023/8/1 + */ +@Data +public class DropdownListVo implements Serializable { + private String value; + private String label; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java new file mode 100644 index 0000000..f43d020 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java @@ -0,0 +1,32 @@ +package org.nl.wms.pda.service.impl; + +import lombok.extern.slf4j.Slf4j; +import org.nl.wms.pda.service.PdaService; +import org.nl.wms.pda.service.dao.mapper.PdaMapper; +import org.nl.wms.pda.service.dao.vo.DropdownListVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author: lyd + * @Description: 实现类 + * @Date: 2023/8/1 + */ +@Slf4j +@Service +public class PdaServiceImpl implements PdaService { + @Autowired + private PdaMapper pdaMapper; + @Override + public List getDeviceInfo() { + // 暂定压机区域 + return pdaMapper.getDeviceInfo(); + } + + @Override + public List getDeviceStatus() { + return pdaMapper.getDictByCode("device_status"); + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/PdmBdProductionProcessTracking.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/PdmBdProductionProcessTracking.java index 9fb7e61..efa1b22 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/PdmBdProductionProcessTracking.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/PdmBdProductionProcessTracking.java @@ -41,4 +41,16 @@ public class PdmBdProductionProcessTracking implements Serializable { private String vehicle_code; @TableField(exist = false) private String point_name; + @TableField(exist = false) + private String device_code; + @TableField(exist = false) + private String material_code; + @TableField(exist = false) + private String material_name; + @TableField(exist = false) + private String pcsn; + @TableField(exist = false) + private String half_material_code; + @TableField(exist = false) + private String raw_material_code; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.xml index 3e33002..5b95903 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.xml @@ -6,11 +6,19 @@ SELECT pt.*, vg.vehicle_code, - p.point_name + p.point_name, + vg.pcsn, + w.point_code AS device_code, + m.material_code, + m.material_name, + m.half_material_code, + m.raw_material_code FROM `pdm_bd_production_process_tracking` pt LEFT JOIN sch_base_vehiclematerialgroup vg ON vg.buss_move_id = pt.buss_move_id LEFT JOIN sch_base_point p ON p.point_code = pt.process_location + LEFT JOIN pdm_bd_workorder w ON w.workorder_code = vg.workorder_code + LEFT JOIN md_base_material m ON m.material_id = vg.material_id ORDER BY pt.buss_move_id, pt.record_time diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java index d7e1449..f5f7acc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/PdmBdWorkorder.java @@ -89,6 +89,8 @@ public class PdmBdWorkorder implements Serializable { @ApiModelProperty(value = "外部标识") private String ext_id; + @ApiModelProperty(value = "外部数据") + private String ext_data; @ApiModelProperty(value = "是否删除") private Boolean is_delete; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.java index c6faca7..bcd7d94 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.java @@ -3,6 +3,7 @@ package org.nl.wms.pdm.workorder.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; +import org.nl.wms.pdm.workorder.service.dao.vo.AcsWorkOrderVo; import org.nl.wms.pdm.workorder.service.dto.PdmBdWorkorderQuery; /** @@ -12,4 +13,11 @@ import org.nl.wms.pdm.workorder.service.dto.PdmBdWorkorderQuery; public interface PdmBdWorkorderMapper extends BaseMapper { IPage selectPageLeftJoin(IPage pages, PdmBdWorkorderQuery query); + + /** + * 获取需要下发的工单 + * @param workorderId + * @return + */ + AcsWorkOrderVo toAcsWorkOrderById(String workorderId); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml index 4bda5f9..62a51a9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml @@ -30,4 +30,22 @@ + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java new file mode 100644 index 0000000..fe92e16 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java @@ -0,0 +1,23 @@ +package org.nl.wms.pdm.workorder.service.dao.vo; + +import lombok.Data; + +/** + * @Author: lyd + * @Description: 下发工单给ACS + * @Date: 2023/8/1 + */ +@Data +public class AcsWorkOrderVo { + private String workorder_code; + private String device_code; + private String material_code; + private String plan_qty; + private String a; + private String b; + private String h; + private String w; + private String size; // 尺寸允许误差 + private String single_weight; // 单重允许误差 + private String drawing_address; // 图纸地址 +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderDto.java index f878083..5bb9151 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderDto.java @@ -79,6 +79,9 @@ public class PdmBdWorkorderDto implements Serializable { /** 外部标识 */ private String ext_id; + /** 外部标识 */ + private String ext_data; + /** 是否删除 */ private Boolean is_delete; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java index 9161ccc..571f567 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java @@ -20,6 +20,7 @@ import org.nl.wms.ext.acs.service.dto.ResultForAcs; import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; import org.nl.wms.pdm.workorder.service.dao.mapper.PdmBdWorkorderMapper; +import org.nl.wms.pdm.workorder.service.dao.vo.AcsWorkOrderVo; import org.nl.wms.pdm.workorder.service.dto.PdmBdWorkorderQuery; import org.nl.wms.sch.task_manage.GeneralDefinition; import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum; @@ -131,9 +132,11 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl mudTransfer(JSONObject json, PageQuery page){ @@ -37,11 +40,24 @@ public class ReportController { return null; } - @PostMapping("/inventoryAlert") + @GetMapping("/inventoryAlert") @Log("库存物料提示记录表") @ApiOperation("库存物料提示记录表") public ResponseEntity inventoryAlert(JSONObject json, PageQuery page){ // return new ResponseEntity<>(TableDataInfo.build(reportService.inventoryAlert(json,page)), HttpStatus.OK); return null; } + + @GetMapping("/intoKilnReport") + @Log("入窑记录报表") + @ApiOperation("入窑记录报表") + public ResponseEntity intoKilnReport(Map json, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(reportService.intoKilnReport(json,page)), HttpStatus.OK); + } + @GetMapping("/outKilnReport") + @Log("出窑窑记录报表") + @ApiOperation("出窑窑记录报表") + public ResponseEntity outKilnReport(Map json, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(reportService.outKilnReport(json,page)), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java index 8deb9dd..831cd0c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java @@ -1,8 +1,10 @@ package org.nl.wms.report.service; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; +import org.nl.wms.report.service.dao.vo.IOKilnReportVo; + +import java.util.Map; /** * @Author: lyd @@ -10,6 +12,9 @@ import org.nl.common.domain.query.PageQuery; * @Date: 2023/7/21 */ public interface ReportService { + IPage intoKilnReport(Map json, PageQuery page); + + IPage outKilnReport(Map json, PageQuery page); // IPage<> mudTransfer(JSONObject json, PageQuery page); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java index d1a69a3..fdd4957 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.java @@ -1,9 +1,16 @@ package org.nl.wms.report.service.dao.mapper; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.wms.report.service.dao.vo.IOKilnReportVo; + /** * @Author: lyd * @Description: 报表mapper * @Date: 2023/7/21 */ public interface ReportMapper { + IPage intoKilnReportByPage(IPage pages, JSONObject query); + + IPage outKilnReportByPage(IPage pages, JSONObject object); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml index 2164a72..3abe23e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml @@ -1,5 +1,31 @@ - + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/IOKilnReportVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/IOKilnReportVo.java new file mode 100644 index 0000000..5674fc1 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/IOKilnReportVo.java @@ -0,0 +1,19 @@ +package org.nl.wms.report.service.dao.vo; + +import lombok.Data; + +/** + * @Author: lyd + * @Description: 出入窑记录报表 + * @Date: 2023/8/1 + */ +@Data +public class IOKilnReportVo { + private String into_kiln_time; + private String out_kiln_time; + private String vehicle_code; + private String pcsn; + private String material_qty; + private String material_code; + private String material_name; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java index f63d367..e4b1206 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java @@ -1,9 +1,18 @@ package org.nl.wms.report.service.impl; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.report.service.ReportService; +import org.nl.wms.report.service.dao.mapper.ReportMapper; +import org.nl.wms.report.service.dao.vo.IOKilnReportVo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Map; + /** * @Author: lyd * @Description: @@ -12,4 +21,19 @@ import org.springframework.stereotype.Service; @Slf4j @Service public class ReportServiceImpl implements ReportService { + @Autowired + private ReportMapper reportMapper; + @Override + public IPage intoKilnReport(Map query, PageQuery page) { + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = reportMapper.intoKilnReportByPage(pages, new JSONObject(query)); + return pages; + } + + @Override + public IPage outKilnReport(Map query, PageQuery page) { + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = reportMapper.outKilnReportByPage(pages, new JSONObject(query)); + return pages; + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java index 2fd17fe..cd1e36c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/GeneralDefinition.java @@ -67,4 +67,9 @@ public class GeneralDefinition { public static final String IS_CONNECT_ACS = "is_connect_acs"; /** ACS路径 */ public static final String ACS_URL = "acs_url"; + // 完成/取消 + /** 任务完成 */ + public static final String TASK_FINISH = "任务完成"; + /** 任务取消 */ + public static final String TASK_CANCEL = "任务取消"; } 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 6ed6f1a..569df17 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 @@ -138,7 +138,7 @@ // } // // 任务完成 // taskObj.setTask_status(TaskStatus.FINISHED.getCode()); -// taskObj.setRemark("任务完成"); +// taskObj.setRemark(GeneralDefinition.TASK_FINISH); // } // if (status.equals(TaskStatus.CANCELED)) { // 取消 // // 起点解锁 @@ -146,7 +146,7 @@ // startPointObj.setIng_task_code(""); // pointService.update(startPointObj); // } -// taskObj.setRemark("任务取消"); +// taskObj.setRemark(GeneralDefinition.TASK_CANCEL); // taskObj.setTask_status(TaskStatus.CANCELED.getCode()); // } // taskService.update(taskObj); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java index 458834e..bc3ce4c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java @@ -156,7 +156,7 @@ public class CTQKTask extends AbstractTask { } // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); @@ -173,7 +173,7 @@ public class CTQKTask extends AbstractTask { pointService.updateById(startPointObj); } taskObj.setTask_status(TaskStatus.CANCELED.getCode()); - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); 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 bc28dfa..16d2a2c 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 @@ -152,7 +152,7 @@ public class DTSKTask extends AbstractTask { PointUtils.clearPoint(startPointObj); } taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); @@ -169,7 +169,7 @@ public class DTSKTask extends AbstractTask { pointService.update(endPointObj); } taskObj.setTask_status(TaskStatus.CANCELED.getCode()); - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setTask_status(TaskStatus.CANCELED.getCode()); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java index 42c22ce..fe76b93 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java @@ -323,7 +323,7 @@ public class FJMKTask extends AbstractTask { vehiclematerialgroupService.updateById(vehicleMaterialGroupObj); } taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); @@ -344,7 +344,7 @@ public class FJMKTask extends AbstractTask { pointService.updateById(bzxPointObj); } taskObj.setTask_status(TaskStatus.CANCELED.getCode()); - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); 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 6aa55c4..2265f35 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 @@ -211,7 +211,7 @@ public class FJQKTask extends AbstractTask { } // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); @@ -226,7 +226,7 @@ public class FJQKTask extends AbstractTask { PointUtils.setUpdateByType(startPointObj, taskFinishedType); pointService.updateById(startPointObj); } - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setTask_status(TaskStatus.CANCELED.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); 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 4497489..5f4688c 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 @@ -201,7 +201,7 @@ public class FJQLTask extends AbstractTask { } // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); @@ -216,7 +216,7 @@ public class FJQLTask extends AbstractTask { PointUtils.setUpdateByType(startPointObj, taskFinishedType); pointService.updateById(startPointObj); } - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setTask_status(TaskStatus.CANCELED.getCode()); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java index b182b0b..527e5f8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java @@ -238,7 +238,7 @@ public class FJRKTask extends AbstractTask { PointUtils.setUpdateByType(startPointObj, taskFinishedType); PointUtils.clearPoint(startPointObj); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); @@ -255,7 +255,7 @@ public class FJRKTask extends AbstractTask { pointService.updateById(endPointObj); } taskObj.setTask_status(TaskStatus.CANCELED.getCode()); - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); 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 c81f5c4..95cccce 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 @@ -180,7 +180,7 @@ public class FJSKTask extends AbstractTask { vehiclematerialgroupService.updateById(vehiclematerialgroup); } taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); @@ -196,7 +196,7 @@ public class FJSKTask extends AbstractTask { pointService.update(endPointObj); } taskObj.setTask_status(TaskStatus.CANCELED.getCode()); - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setTask_status(TaskStatus.CANCELED.getCode()); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); 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 5ec5854..af843a8 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 @@ -209,7 +209,7 @@ public class FJSLTask extends AbstractTask { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); @@ -225,7 +225,7 @@ public class FJSLTask extends AbstractTask { PointUtils.setUpdateByType(endPointObj, taskFinishedType); pointService.updateById(endPointObj); } - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setTask_status(TaskStatus.CANCELED.getCode()); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); 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 52aa2f7..55d93ce 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 @@ -208,15 +208,15 @@ public class HNMLTask extends AbstractTask { parentPointCode = split[responseObj.getInteger("direction") - 1]; } // 找到父点位 - SchBasePoint serviceOne = pointService.getOne(new LambdaQueryWrapper() + SchBasePoint yjDevice = pointService.getOne(new LambdaQueryWrapper() .eq(SchBasePoint::getPoint_code, parentPointCode)); // 父点位（设备）需要切换成非空状态 - PointUtils.setUpdateByType(serviceOne, taskFinishedType); - serviceOne.setPoint_status(PointStatusEnum.FULL_POINT.getCode()); - pointService.updateById(serviceOne); + PointUtils.setUpdateByType(yjDevice, taskFinishedType); + yjDevice.setPoint_status(PointStatusEnum.FULL_POINT.getCode()); + pointService.updateById(yjDevice); // 找压机工单 PdmBdWorkorder one = workorderService.getOne(new LambdaQueryWrapper() - .eq(serviceOne != null, PdmBdWorkorder::getPoint_code, serviceOne.getPoint_code()) + .eq(yjDevice != null, PdmBdWorkorder::getPoint_code, yjDevice.getPoint_code()) .eq(PdmBdWorkorder::getWorkorder_status, WorkOrderStatusEnum.PRODUCING.getCode())); if (ObjectUtil.isNotEmpty(one)) { // 给组盘数据设置批次：压制工单+混砂机号+碾次 @@ -239,7 +239,7 @@ public class HNMLTask extends AbstractTask { vehiclematerialgroupService.updateById(groupEntity); // 起点清空 - 由ACS请求修改 // PointUtils.clearPoint(startPointObj); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); @@ -257,7 +257,7 @@ public class HNMLTask extends AbstractTask { PointUtils.setUpdateByType(one, taskFinishedType); pointService.updateById(one); } - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setTask_status(TaskStatus.CANCELED.getCode()); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); 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 c3ab19b..9742c1d 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 @@ -140,7 +140,7 @@ // } // // 任务完成 // taskObj.setTask_status(TaskStatus.FINISHED.getCode()); -// taskObj.setRemark("任务完成"); +// taskObj.setRemark(GeneralDefinition.TASK_FINISH); // } // if (status.equals(TaskStatus.CANCELED)) { // 取消 // // 起点解锁 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java index d0e4f78..e64c205 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java @@ -12,6 +12,8 @@ import java.util.List; * @Date: 2023/6/19 */ public interface HNMapper extends BaseMapper { + // 通过叫料单 List findPointForHNML(List regionCode, String materialId); + // 通过工单与点位更新 List findPointForHNMLAndWorkOrder(List regionCode, String materialCode); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java index bc8b1ec..b2c1fc5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/CYZCTask.java @@ -221,7 +221,7 @@ public class CYZCTask extends AbstractTask { } // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); @@ -235,7 +235,7 @@ public class CYZCTask extends AbstractTask { endPointObj.setIng_task_code(""); pointService.update(endPointObj); } - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setTask_status(TaskStatus.CANCELED.getCode()); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); 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 23957df..37c674c 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 @@ -157,7 +157,7 @@ public class GZYQLTask extends AbstractTask { } // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); @@ -172,7 +172,7 @@ public class GZYQLTask extends AbstractTask { PointUtils.setUpdateByType(startPointObj, taskFinishedType); pointService.updateById(startPointObj); } - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setTask_status(TaskStatus.CANCELED.getCode()); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); 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 c20e0c0..454f681 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 @@ -166,7 +166,7 @@ public class YZQKTask extends AbstractTask { } // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); 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 c75fdf9..0c749ad 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 @@ -181,7 +181,7 @@ public class YZSKTask extends AbstractTask { pointService.updateById(endPointObj); } taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); // 区分完成者 taskService.updateById(taskObj); @@ -197,7 +197,7 @@ public class YZSKTask extends AbstractTask { PointUtils.setUpdateByType(endPointObj, taskFinishedType); pointService.updateById(endPointObj); } - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setTask_status(TaskStatus.CANCELED.getCode()); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java index 9c89193..b79a450 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java @@ -316,7 +316,7 @@ public class YZSLTask extends AbstractTask { PointUtils.clearPoint(startPointObj); // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setRemark("任务完成"); + taskObj.setRemark(GeneralDefinition.TASK_FINISH); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); @@ -332,7 +332,7 @@ public class YZSLTask extends AbstractTask { PointUtils.setUpdateByType(endPointObj, taskFinishedType); pointService.updateById(endPointObj); } - taskObj.setRemark("任务取消"); + taskObj.setRemark(GeneralDefinition.TASK_CANCEL); taskObj.setTask_status(TaskStatus.CANCELED.getCode()); taskObj.setFinished_type(taskFinishedType.getCode()); TaskUtils.setUpdateByType(taskObj, taskFinishedType); diff --git a/lms/nladmin-ui/src/views/wms/das/devicecheck/dasDeviceCheckRecord.js b/lms/nladmin-ui/src/views/wms/das/devicecheck/dasDeviceCheckRecord.js new file mode 100644 index 0000000..5d99e4e --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/das/devicecheck/dasDeviceCheckRecord.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/dasDeviceCheckRecord', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/dasDeviceCheckRecord/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/dasDeviceCheckRecord', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/lms/nladmin-ui/src/views/wms/das/devicecheck/index.vue b/lms/nladmin-ui/src/views/wms/das/devicecheck/index.vue new file mode 100644 index 0000000..1a35d85 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/das/devicecheck/index.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/das/inspection/dasQualityInspection.js b/lms/nladmin-ui/src/views/wms/das/inspection/dasQualityInspection.js new file mode 100644 index 0000000..5fa272b --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/das/inspection/dasQualityInspection.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/dasQualityInspection', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/dasQualityInspection/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/dasQualityInspection', + method: 'put', + data + }) +} + +export default { add, edit, del } diff --git a/lms/nladmin-ui/src/views/wms/das/inspection/index.vue b/lms/nladmin-ui/src/views/wms/das/inspection/index.vue new file mode 100644 index 0000000..083a5bd --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/das/inspection/index.vue @@ -0,0 +1,107 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/das/intoKiln/index.vue b/lms/nladmin-ui/src/views/wms/das/intoKiln/index.vue new file mode 100644 index 0000000..ac0cdcf --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/das/intoKiln/index.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/lms/nladmin-ui/src/views/wms/pdm/track/index.vue b/lms/nladmin-ui/src/views/wms/pdm/track/index.vue index c0ff3fc..76de25a 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/track/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/track/index.vue @@ -53,6 +53,9 @@ + + + @@ -62,7 +65,7 @@