From 646e67058e9242003d421d18018d4e4d1a0e7abd Mon Sep 17 00:00:00 2001 From: psh Date: Tue, 21 May 2024 17:59:15 +0800 Subject: [PATCH] fix --- .../java/org/nl/wms/pda/controller/PdaController.java | 11 +++++++++-- .../main/java/org/nl/wms/pda/service/PdaService.java | 4 ++++ .../nl/wms/pda/service/dao/dto/SendMaterialDto.java | 2 ++ .../org/nl/wms/pda/service/dao/mapper/PdaMapper.java | 4 ++++ .../org/nl/wms/pda/service/dao/mapper/PdaMapper.xml | 10 ++++++++++ .../org/nl/wms/pda/service/impl/PdaServiceImpl.java | 5 +++++ 6 files changed, 34 insertions(+), 2 deletions(-) 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 index dcb1feb..000b80c 100644 --- 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 @@ -68,11 +68,18 @@ public class PdaController { return new ResponseEntity<>(pdaService.coatedWireIntoStorageTaskShow(), HttpStatus.OK); } + @PostMapping("/getPointList") + @Log("涂板线入库-获取涂板线列表") + @ApiOperation("涂板线入库-获取涂板线列表") + public ResponseEntity getPointList(){ + return new ResponseEntity<>(pdaService.getPointList(), HttpStatus.OK); + } + @PostMapping("/getInventoryMaterialInfo") @Log("获取暂存区库存信息") @ApiOperation("获取暂存区库存信息") - public ResponseEntity> getInventoryMaterialInfo(@RequestParam String material_code){ - return new ResponseEntity<>(pdaService.getInventoryMaterialInfo(material_code), HttpStatus.OK); + public ResponseEntity> getInventoryMaterialInfo(@RequestBody SendMaterialDto sendMaterialDto){ + return new ResponseEntity<>(pdaService.getInventoryMaterialInfo(sendMaterialDto.getMaterial_code()), HttpStatus.OK); } @PostMapping("/materialList") @Log("设备状态下拉框数据") 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 index c97ef31..8d94104 100644 --- 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 @@ -3,6 +3,7 @@ package org.nl.wms.pda.service; import org.nl.wms.pda.service.dao.dto.ManualSortingDto; import org.nl.wms.pda.service.dao.dto.SendMaterialDto; import org.nl.wms.pda.service.dao.vo.*; +import org.nl.wms.sch.point.service.dto.SchBasePointDto; import java.util.List; @@ -44,6 +45,9 @@ public interface PdaService { */ List coatedWireIntoStorageTaskShow(); + + List getPointList(); + /** * 根据物料编码获取物料库存信息 * @param materialCode / diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/SendMaterialDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/SendMaterialDto.java index 9d96752..b2f5ac4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/SendMaterialDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/SendMaterialDto.java @@ -17,4 +17,6 @@ public class SendMaterialDto { * 物料数量 */ private Integer qty; + + private String material_code; } 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 index 1ce72d5..44737b3 100644 --- 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 @@ -4,6 +4,7 @@ import org.nl.wms.pda.service.dao.vo.DropdownListVo; import org.nl.wms.pda.service.dao.vo.ManualWorkOrderVo; import org.nl.wms.pda.service.dao.vo.MaterialInventoryVo; import org.nl.wms.pda.service.dao.vo.TaskShowVo; +import org.nl.wms.sch.point.service.dto.SchBasePointDto; import java.util.List; @@ -40,4 +41,7 @@ public interface PdaMapper { * @return / */ List getmaterialList(); + + + List getPointList(); } 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 index f98d324..aa9a06b 100644 --- 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 @@ -77,4 +77,14 @@ FROM `md_base_material` + + + 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 index fad0dcb..0e11101 100644 --- 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 @@ -14,6 +14,7 @@ import org.nl.wms.pda.service.dao.mapper.PdaMapper; import org.nl.wms.pda.service.dao.vo.*; import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; +import org.nl.wms.sch.point.service.dto.SchBasePointDto; import org.nl.wms.sch.task.service.ISchBaseTaskService; import org.nl.wms.sch.task_manage.AbstractTask; import org.nl.wms.sch.task_manage.GeneralDefinition; @@ -116,6 +117,10 @@ public class PdaServiceImpl implements PdaService { return PdaResponseVo.pdaResultOk("涂板线入库请求成功"); } + public List getPointList(){ + return pdaMapper.getPointList(); + } + @Override public List coatedWireIntoStorageTaskShow() { return pdaMapper.getRunningTaskByConfigAndCreateMode("TBXMLTask", GeneralDefinition.PDA_CREATION);