diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java index 07529a3..6b4474d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/ReportController.java @@ -191,6 +191,14 @@ public class ReportController { return new ResponseEntity<>(TableDataInfo.build(reportService.getSupplierNameList()),HttpStatus.OK); } + @GetMapping("/getNowSupplierNameList") + @Log("查询供应商名称列表") + @ApiOperation("查询供应商名称列表") + //@SaCheckPermission("@el.check('material:list')") + public ResponseEntity getNowSupplierNameList(){ + return new ResponseEntity<>(TableDataInfo.build(reportService.getNowSupplierNameList()),HttpStatus.OK); + } + @GetMapping("/getProductDescriptionList") @Log("查询物料名称列表") @ApiOperation("查询物料名称列表") @@ -199,6 +207,14 @@ public class ReportController { return new ResponseEntity<>(TableDataInfo.build(reportService.getProductDescriptionList()),HttpStatus.OK); } + @GetMapping("/getNowProductDescriptionList") + @Log("查询物料名称列表") + @ApiOperation("查询物料名称列表") + //@SaCheckPermission("@el.check('material:list')") + public ResponseEntity getNowProductDescriptionList(){ + return new ResponseEntity<>(TableDataInfo.build(reportService.getNowProductDescriptionList()),HttpStatus.OK); + } + @GetMapping("/getLotSNList") @Log("查询晶棒编号列表") @ApiOperation("查询晶棒编号列表") @@ -215,6 +231,14 @@ public class ReportController { return new ResponseEntity<>(TableDataInfo.build(reportService.getIngotBatchList()),HttpStatus.OK); } + @GetMapping("/getNowIngotBatchList") + @Log("查询批次号列表") + @ApiOperation("查询批次号列表") + //@SaCheckPermission("@el.check('material:list')") + public ResponseEntity getNowIngotBatchList(){ + return new ResponseEntity<>(TableDataInfo.build(reportService.getNowIngotBatchList()),HttpStatus.OK); + } + @PostMapping("/hwtask") @Log("回温出库") @ApiOperation("回温出库") diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java index 52808b6..235f142 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/IReportService.java @@ -119,12 +119,18 @@ public interface IReportService extends IService { List getSupplierNameList(); + List getNowSupplierNameList(); + List getProductDescriptionList(); + List getNowProductDescriptionList(); + List getLotSNList(); List getIngotBatchList(); + List getNowIngotBatchList(); + void hwtask(JSONObject param); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java index 3a4e5e1..5e5032a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.java @@ -46,12 +46,18 @@ public interface ReportMapper extends BaseMapper { @Select("select supplierName from sch_base_material group by supplierName") List getSupplierNameList(); + List getNowSupplierNameList(); + @Select("select productDescription from sch_base_material group by productDescription") List getProductDescriptionList(); + List getNowProductDescriptionList(); + @Select("select lotSN from sch_base_material") List getLotSNList(); @Select("select ingotBatch from sch_base_material group by ingotBatch") List getIngotBatchList(); + + List getNowIngotBatchList(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml index 732d39e..379591e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml @@ -612,4 +612,45 @@ ORDER BY p.update_time DESC, pointCode ASC + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java index c8444a2..d4b553a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/impl/ReportServiceImpl.java @@ -320,10 +320,18 @@ public class ReportServiceImpl extends ServiceImpl impl return reportMapper.getSupplierNameList(); } + public List getNowSupplierNameList(){ + return reportMapper.getNowSupplierNameList(); + } + public List getProductDescriptionList(){ return reportMapper.getProductDescriptionList(); } + public List getNowProductDescriptionList(){ + return reportMapper.getNowProductDescriptionList(); + } + public List getLotSNList(){ return reportMapper.getLotSNList(); } @@ -332,6 +340,10 @@ public class ReportServiceImpl extends ServiceImpl impl return reportMapper.getIngotBatchList(); } + public List getNowIngotBatchList(){ + return reportMapper.getNowIngotBatchList(); + } + @Override public void hwtask(JSONObject param){ diff --git a/lms/nladmin-ui/src/views/wms/hw/detail/index.vue b/lms/nladmin-ui/src/views/wms/hw/detail/index.vue index 182b398..3f0bf79 100644 --- a/lms/nladmin-ui/src/views/wms/hw/detail/index.vue +++ b/lms/nladmin-ui/src/views/wms/hw/detail/index.vue @@ -44,7 +44,7 @@ placeholder="供应商名称" class="filter-item" filterable - @remote-method="getSupplierNameList" + @remote-method="getNowSupplierNameList" >