From 3b0b5bc2cfc5fafdfb83e52b30c0548b98d71f25 Mon Sep 17 00:00:00 2001 From: psh Date: Tue, 9 Apr 2024 16:05:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=89=B9=E9=87=8F=E9=80=89=E6=8B=A9=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E7=89=A9=E6=96=99=E8=BF=9B=E8=A1=8C=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PdmBdWorkorderDetailController.java | 66 ++++++ .../pdm/controller/PointDetailController.java | 47 ++++ .../pdm/service/dao/PdmBdWorkorderDetail.java | 50 ++++ .../nl/wms/pdm/service/dao/PointDetail.java | 2 + .../wms/pdm/service/dao/PointDetailAdd.java | 11 + .../mapper/PdmBdWorkorderDetailMapper.java | 13 ++ .../dao/mapper/PdmBdWorkorderDetailMapper.xml | 10 + .../impl/PdmBdWorkorderServiceImpl.java | 26 +++ .../sch/task_manage/task/tasks/KJRKTask.java | 2 +- .../sch/task_manage/task/tasks/POINTTask.java | 2 +- .../task_manage/task/tasks/SSXBKJTask.java | 2 +- .../sch/task_manage/task/tasks/YCLCKTask.java | 6 +- .../sch/task_manage/task/tasks/YCLRKTask.java | 2 +- .../wms/pdm/workerorder/PointDetailDialog.vue | 219 ++++++++++++++++++ .../pdm/workerorder/WorkOrderDetailDialog.vue | 183 +++++++++++++++ .../src/views/wms/pdm/workerorder/index.vue | 48 ++-- 16 files changed, 663 insertions(+), 26 deletions(-) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderDetailController.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PointDetailController.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorderDetail.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetail.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetailAdd.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.xml create mode 100644 lms/nladmin-ui/src/views/wms/pdm/workerorder/PointDetailDialog.vue create mode 100644 lms/nladmin-ui/src/views/wms/pdm/workerorder/WorkOrderDetailDialog.vue diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderDetailController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderDetailController.java new file mode 100644 index 0000000..a603c79 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PdmBdWorkorderDetailController.java @@ -0,0 +1,66 @@ +package org.nl.wms.pdm.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.pdm.service.IPdmBdWorkorderService; +import org.nl.wms.pdm.service.dao.PdmBdWorkorder; +import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; +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.Set; +/** +* @author lyd +* @date 2023-05-05 +**/ +@Slf4j +@RestController +@Api(tags = "工单管理管理") +@RequestMapping("/api/pdmBdWorkorder") +public class PdmBdWorkorderController { + + @Autowired + private IPdmBdWorkorderService pdmBdWorkorderService; + + @GetMapping + @Log("查询工单管理") + @ApiOperation("查询工单管理") + //@SaCheckPermission("@el.check('pdmBdWorkorder:list')") + public ResponseEntity query(PdmBdWorkorderQuery query, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(pdmBdWorkorderService.queryAll(query,page)),HttpStatus.OK); + } + + @PostMapping + @Log("新增工单管理") + @ApiOperation("新增工单管理") + //@SaCheckPermission("@el.check('pdmBdWorkorder:add')") + public ResponseEntity create(@Validated @RequestBody PdmBdWorkorder entity){ + pdmBdWorkorderService.create(entity); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改工单管理") + @ApiOperation("修改工单管理") + //@SaCheckPermission("@el.check('pdmBdWorkorder:edit')") + public ResponseEntity update(@Validated @RequestBody PdmBdWorkorder entity){ + pdmBdWorkorderService.update(entity); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除工单管理") + @ApiOperation("删除工单管理") + //@SaCheckPermission("@el.check('pdmBdWorkorder:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody Set ids) { + pdmBdWorkorderService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PointDetailController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PointDetailController.java new file mode 100644 index 0000000..8dd2b63 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/controller/PointDetailController.java @@ -0,0 +1,47 @@ +package org.nl.wms.pdm.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.pdm.service.IPdmBdWorkorderService; +import org.nl.wms.pdm.service.dao.PdmBdWorkorder; +import org.nl.wms.pdm.service.dao.PdmBdWorkorderDetail; +import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; +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.Set; + + +@Slf4j +@RestController +@Api(tags = "工单详情管理") +@RequestMapping("/api/pdmBdWorkorderDetail") +public class PdmBdWorkorderDetailController { + + @Autowired + private IPdmBdWorkorderService pdmBdWorkorderService; + + @GetMapping + @Log("查询工单详情管理") + @ApiOperation("查询工单详情管理") + //@SaCheckPermission("@el.check('pdmBdWorkorder:list')") + public ResponseEntity query(PdmBdWorkorderQuery query, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(pdmBdWorkorderService.queryAllDetail(query,page)),HttpStatus.OK); + } + + @GetMapping + @Log("根据物料查询点位库存") + @ApiOperation("根据物料查询点位库存") + //@SaCheckPermission("@el.check('pdmBdWorkorder:list')") + public ResponseEntity queryPointDetail(String PalletSN, PageQuery page){ + return new ResponseEntity<>(TableDataInfo.build(pdmBdWorkorderService.queryPointDetail(PalletSN,page)),HttpStatus.OK); + } + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorderDetail.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorderDetail.java new file mode 100644 index 0000000..1bf4511 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PdmBdWorkorderDetail.java @@ -0,0 +1,50 @@ +package org.nl.wms.pdm.service.dto; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("sch_base_material") +public class PdmBdWorkorderDetail implements Serializable { + + /** 工单编号 */ + private String workorder_code; + /** 实际数量 */ + private BigDecimal real_qty; + /** 订单行项目编号 **/ + private String POSNR; + /** 预留行项目编号 **/ + private String RSPOS; + /** 移动类型 **/ + private String BWART; + /** 物料编码 **/ + private String MATNR; + /** 物料名称 **/ + private String MAKTX; + /** 产品类别 **/ + private String MTYPE; + /** 产品类别描述 **/ + private String MTYTXT; + /** 数量 **/ + private String BDMNG; + /** 计量单位 **/ + private String MEINS; + /** 物料供应标识 **/ + private String BEIKZ; + /** 预留字段11 **/ + private String ZRSV11; + /** 预留字段12 **/ + private String ZRSV12; + /** 预留字段13 **/ + private String ZRSV13; + /** 预留字段14 **/ + private String ZRSV14; + /** 预留字段15 **/ + private String ZRSV15; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetail.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetail.java new file mode 100644 index 0000000..710e0fa --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetail.java @@ -0,0 +1,2 @@ +package org.nl.wms.pdm.service.dao;public class PointDetail { +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetailAdd.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetailAdd.java new file mode 100644 index 0000000..8248961 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/PointDetailAdd.java @@ -0,0 +1,11 @@ +package org.nl.wms.pdm.service.dao; + +import lombok.Data; + +@Data +public class PointDetail { + private String point_code; + private String productName; + private String PalletSN; + private String qty; +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.java new file mode 100644 index 0000000..d2fcdff --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.java @@ -0,0 +1,13 @@ +package org.nl.wms.pdm.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.wms.pdm.service.dao.PdmBdWorkorder; +import org.nl.wms.pdm.service.dao.PdmBdWorkorderDetail; +import org.nl.wms.pdm.service.dao.PointDetail; +import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; + +public interface PdmBdWorkorderDetailMapper extends BaseMapper { + + IPage selectPointDetail(IPage pages, String productname); +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.xml new file mode 100644 index 0000000..389e892 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/dao/mapper/PdmBdWorkorderDetailMapper.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java index 233eb17..5fa1092 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/service/impl/PdmBdWorkorderServiceImpl.java @@ -3,7 +3,9 @@ package org.nl.wms.pdm.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.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; @@ -13,6 +15,9 @@ import org.nl.common.utils.CodeUtil; import org.nl.common.utils.SecurityUtils; import org.nl.wms.pdm.service.IPdmBdWorkorderService; import org.nl.wms.pdm.service.dao.PdmBdWorkorder; +import org.nl.wms.pdm.service.dao.PdmBdWorkorderDetail; +import org.nl.wms.pdm.service.dao.PointDetail; +import org.nl.wms.pdm.service.dao.mapper.PdmBdWorkorderDetailMapper; import org.nl.wms.pdm.service.dao.mapper.PdmBdWorkorderMapper; import org.nl.wms.pdm.service.dto.PdmBdWorkorderQuery; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +37,8 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl queryAll(PdmBdWorkorderQuery query, PageQuery page){ @@ -82,4 +89,23 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl queryAllDetail(PdmBdWorkorderQuery query, PageQuery page){ + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PdmBdWorkorderDetail::getWorkorder_code,query.getWorkorder_code()); + pages = pdmBdWorkorderDetailMapper.selectPage(pages,wrapper); + return pages; + } + + @Override + public IPage queryPointDetail(String productname, PageQuery page){ + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + pages = pdmBdWorkorderDetailMapper.selectPointDetail(pages, productname); + return pages; + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java index 0ff84db..266935d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KJRKTask.java @@ -198,7 +198,7 @@ public class KJRKTask extends AbstractTask { vehiclematerialgroupService.save(groupEntity); // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setGroup_id(groupEntity.getGroup_id()); + taskObj.setGroup_id(ObjectUtil.isNotEmpty(groupEntity)?groupEntity.getGroup_id():null); taskObj.setRemark("任务完成"); try { //todo 入库成功后上报mes diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java index 7d5185f..2aba17d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/POINTTask.java @@ -189,7 +189,7 @@ public class POINTTask extends AbstractTask { pointService.updateById(startPointObj); // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setGroup_id(one.getGroup_id()); + taskObj.setGroup_id(ObjectUtil.isNotEmpty(one)?one.getGroup_id():null); taskObj.setRemark("任务完成"); } if (status.equals(TaskStatus.CANCELED)) { // 取消 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java index fec91a3..c8761ce 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/SSXBKJTask.java @@ -197,7 +197,7 @@ public class SSXBKJTask extends AbstractTask { vehiclematerialgroupService.save(groupEntity); // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setGroup_id(groupEntity.getGroup_id()); + taskObj.setGroup_id(ObjectUtil.isNotEmpty(groupEntity)?groupEntity.getGroup_id():null); taskObj.setRemark("任务完成"); try { //todo 入库成功后上报mes diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java index 19f4b7a..f4ee963 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java @@ -114,10 +114,10 @@ public class YCLCKTask extends AbstractTask { taskService.update(task); //发起任务时先把点位占用，防止发起重复任务 -// point.setIng_task_code(task.getTask_code()); + point.setIng_task_code(task.getTask_code()); // point.setVehicle_qty(point.getVehicle_qty() - 1); // point.setVehicle_type(materialType); -// pointService.update(point); + pointService.update(point); //下发 this.renotifyAcs(task); @@ -224,7 +224,7 @@ public class YCLCKTask extends AbstractTask { pointService.updateById(startPointObj); // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setGroup_id(one.getGroup_id()); + taskObj.setGroup_id(ObjectUtil.isNotEmpty(one)?one.getGroup_id():null); taskObj.setRemark("任务完成"); try { //todo 待确认具体传值 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java index 99d617b..2dd590c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLRKTask.java @@ -201,7 +201,7 @@ public class YCLRKTask extends AbstractTask { vehiclematerialgroupService.save(groupEntity); // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); - taskObj.setGroup_id(groupEntity.getGroup_id()); + taskObj.setGroup_id(ObjectUtil.isNotEmpty(groupEntity)?groupEntity.getGroup_id():null); taskObj.setRemark("任务完成"); try { //todo 待确认具体传值 diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/PointDetailDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/PointDetailDialog.vue new file mode 100644 index 0000000..0ddf71f --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/PointDetailDialog.vue @@ -0,0 +1,219 @@ + + + + + + \ No newline at end of file diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/WorkOrderDetailDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/WorkOrderDetailDialog.vue new file mode 100644 index 0000000..8c2b17c --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/WorkOrderDetailDialog.vue @@ -0,0 +1,183 @@ + + + + + + \ No newline at end of file diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue index 46183c4..40286e2 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue @@ -263,17 +263,17 @@ - + + + + - - + /> --> + +