From 5eebf37b6f270765ff498be99c48743818e99a67 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 3 Aug 2023 08:55:01 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E5=87=BA=E5=85=A5=E7=AA=91=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86=E9=AD=94?= =?UTF-8?q?=E6=B3=95=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-system/doc/wms.xls | Bin 320512 -> 360960 bytes .../handler/GlobalExceptionHandler.java | 9 +- .../MobileAuthorizationController.java | 12 +- .../DasDeviceCheckRecordController.java | 66 ++++++++++ .../service/IDasDeviceCheckRecordService.java | 43 +++++++ .../service/dao/DasDeviceCheckRecord.java | 46 +++++++ .../mapper/DasDeviceCheckRecordMapper.java | 12 ++ .../dao/mapper/DasDeviceCheckRecordMapper.xml | 5 + .../service/dto/DasDeviceCheckRecordDto.java | 34 ++++++ .../dto/DasDeviceCheckRecordQuery.java | 12 ++ .../impl/DasDeviceCheckRecordServiceImpl.java | 75 ++++++++++++ .../DasQualityInspectionController.java | 66 ++++++++++ .../service/IDasQualityInspectionService.java | 46 +++++++ .../service/dao/DasQualityInspection.java | 46 +++++++ .../mapper/DasQualityInspectionMapper.java | 12 ++ .../dao/mapper/DasQualityInspectionMapper.xml | 5 + .../service/dto/DasQualityInspectionDto.java | 34 ++++++ .../dto/DasQualityInspectionQuery.java | 12 ++ .../impl/DasQualityInspectionServiceImpl.java | 115 ++++++++++++++++++ .../wms/ext/acs/service/WmsToAcsService.java | 3 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 16 ++- .../acs/service/impl/WmsToAcsServiceImpl.java | 6 +- .../service/ISysInteractRecordService.java | 18 ++- .../impl/SysInteractRecordServiceImpl.java | 31 ++++- .../nl/wms/pda/controller/PdaController.java | 60 +++++++++ .../org/nl/wms/pda/service/PdaService.java | 16 +++ .../wms/pda/service/dao/mapper/PdaMapper.java | 16 +++ .../wms/pda/service/dao/mapper/PdaMapper.xml | 21 ++++ .../pda/service/dao/vo/DropdownListVo.java | 16 +++ .../wms/pda/service/impl/PdaServiceImpl.java | 32 +++++ .../dao/PdmBdProductionProcessTracking.java | 12 ++ .../PdmBdProductionProcessTrackingMapper.xml | 10 +- .../workorder/service/dao/PdmBdWorkorder.java | 2 + .../dao/mapper/PdmBdWorkorderMapper.java | 8 ++ .../dao/mapper/PdmBdWorkorderMapper.xml | 18 +++ .../service/dao/vo/AcsWorkOrderVo.java | 23 ++++ .../service/dto/PdmBdWorkorderDto.java | 3 + .../impl/PdmBdWorkorderServiceImpl.java | 7 +- .../report/controller/ReportController.java | 22 +++- .../nl/wms/report/service/ReportService.java | 7 +- .../service/dao/mapper/ReportMapper.java | 7 ++ .../service/dao/mapper/ReportMapper.xml | 28 ++++- .../report/service/dao/vo/IOKilnReportVo.java | 19 +++ .../service/impl/ReportServiceImpl.java | 24 ++++ .../sch/task_manage/GeneralDefinition.java | 5 + .../task/tasks/auto/RYKQLTask.java | 4 +- .../task_manage/task/tasks/dtk/CTQKTask.java | 4 +- .../task_manage/task/tasks/dtk/DTSKTask.java | 4 +- .../task_manage/task/tasks/fj/FJMKTask.java | 4 +- .../task_manage/task/tasks/fj/FJQKTask.java | 4 +- .../task_manage/task/tasks/fj/FJQLTask.java | 4 +- .../task_manage/task/tasks/fj/FJRKTask.java | 4 +- .../task_manage/task/tasks/fj/FJSKTask.java | 4 +- .../task_manage/task/tasks/fj/FJSLTask.java | 4 +- .../task_manage/task/tasks/hn/HNMLTask.java | 14 +-- .../task_manage/task/tasks/hn/HNQKTask.java | 2 +- .../task/tasks/hn/mapper/HNMapper.java | 2 + .../task_manage/task/tasks/yao/CYZCTask.java | 4 +- .../task_manage/task/tasks/yao/GZYQLTask.java | 4 +- .../task_manage/task/tasks/yz/YZQKTask.java | 2 +- .../task_manage/task/tasks/yz/YZSKTask.java | 4 +- .../task_manage/task/tasks/yz/YZSLTask.java | 4 +- .../das/devicecheck/dasDeviceCheckRecord.js | 27 ++++ .../src/views/wms/das/devicecheck/index.vue | 106 ++++++++++++++++ .../das/inspection/dasQualityInspection.js | 27 ++++ .../src/views/wms/das/inspection/index.vue | 107 ++++++++++++++++ .../src/views/wms/das/intoKiln/index.vue | 72 +++++++++++ .../src/views/wms/pdm/track/index.vue | 5 +- .../src/views/wms/pdm/workerorder/index.vue | 6 +- 69 files changed, 1435 insertions(+), 67 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/controller/DasDeviceCheckRecordController.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/IDasDeviceCheckRecordService.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/DasDeviceCheckRecord.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dao/mapper/DasDeviceCheckRecordMapper.xml create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/dto/DasDeviceCheckRecordQuery.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/devicecheck/service/impl/DasDeviceCheckRecordServiceImpl.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/controller/DasQualityInspectionController.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/IDasQualityInspectionService.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/DasQualityInspection.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/mapper/DasQualityInspectionMapper.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/mapper/DasQualityInspectionMapper.xml create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionDto.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionQuery.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/vo/DropdownListVo.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/vo/IOKilnReportVo.java create mode 100644 lms/nladmin-ui/src/views/wms/das/devicecheck/dasDeviceCheckRecord.js create mode 100644 lms/nladmin-ui/src/views/wms/das/devicecheck/index.vue create mode 100644 lms/nladmin-ui/src/views/wms/das/inspection/dasQualityInspection.js create mode 100644 lms/nladmin-ui/src/views/wms/das/inspection/index.vue create mode 100644 lms/nladmin-ui/src/views/wms/das/intoKiln/index.vue diff --git a/lms/nladmin-system/doc/wms.xls b/lms/nladmin-system/doc/wms.xls index a27399d4974f627916857cab7bd1789790bf09dd..8283c5728a5fb3cebd8b10afdadd61cc1e0fd950 100644 GIT binary patch delta 45516 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 aN13f7TMf6B^RZc3Rec=Fu}bG?)&CDlEbw0d delta 11304 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�RQY-pO~!u--CE1XY|)j<&AvswBysk}lhbtAFN zO)d2n?2Fl0wbYBlcM+nMT24lz*E!jJDr=u4v2^EGj zyQxxd1d&sv9(3}&H`&aovYquv7JiFmKTef;?wu~FXhoJ3DOk5kLE3<3U0Gh1G#h_B zeUK#;3N^sq%$8yVyH;YxpP|?#Z2V!W8Pe8){+|Bce!cW z 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 @@