From 4a35dea2b0976e7fdb0e2b1a0d7d9b8ac2af0fe4 Mon Sep 17 00:00:00 2001 From: Fancy <Fancy.fx@outlook.com> Date: 星期五, 01 十一月 2024 09:18:49 +0800 Subject: [PATCH] get product --- pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java index 57032ee..491f176 100644 --- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java +++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java @@ -1,12 +1,11 @@ package com.dy.pmsStation.assemblyStep; import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.dy.common.aop.SsoPowerAop; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; -import com.dy.pmsGlobal.pojoPlt.PltProductFile; -import com.dy.pmsGlobal.pojoPlt.PltProductParams; -import com.dy.pmsGlobal.pojoPlt.PltProductQualityInspectionItems; -import com.dy.pmsGlobal.pojoPlt.PltProductTestInspectionItems; +import com.dy.pmsGlobal.aop.Log; +import com.dy.pmsGlobal.pojoPlt.*; import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan; import com.dy.pmsGlobal.pojoPr.PrProductionNode; import com.dy.pmsGlobal.pojoSta.StaDeviceLife; @@ -189,9 +188,14 @@ } //鑷姩鍖栨祴璇� 鏍规嵁浜у搧ID鏌ュ嚭鍏ㄩ儴鎸囦护 @GetMapping(path = "getCommand") - public BaseResponse<TstCommand> getCommand(String proId) { - log.info("AssemblyStepCtrl.getCommand():{}", proId); - List<TstCommand> result = sv.getCommand(proId); + public BaseResponse<TstCommand> getCommand(String proId, int type) { + log.info("AssemblyStepCtrl.getCommand():{}", proId + " " + type); + List<TstCommand> result = sv.getCommand(proId,type); return BaseResponseUtils.buildSuccess(result); } + @GetMapping(path="all") + public BaseResponse<List<PltProduct>> all(){ + QueryVo vo = new QueryVo(); + return BaseResponseUtils.buildSuccess(sv.selectAll(vo)); + } } -- Gitblit v1.8.0