From 0b0ad3d1ab0fcc63f793340b831154d7946c38a0 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 13 Dec 2023 15:01:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E8=AE=BE=E5=A4=87=E7=BB=84=E7=BA=BF=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseEquipmentController.java | 15 +++++++++++---- .../com/op/wms/mapper/BaseEquipmentMapper.java | 3 +++ .../op/wms/service/IBaseEquipmentService.java | 8 ++++---- .../service/impl/BaseEquipmentServiceImpl.java | 18 +++++++++++++++++- .../mapper/wms/BaseEquipmentMapper.xml | 11 +++++++++++ 5 files changed, 46 insertions(+), 9 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java index 54c29ff61..30f9c1ffc 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseEquipmentController.java @@ -11,9 +11,7 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.poi.ExcelMapUtil; import com.op.common.security.utils.SecurityUtils; import com.op.system.api.domain.SysUser; -import com.op.wms.domain.BaseTeamUser; -import com.op.wms.domain.EquSpareEquipment; -import com.op.wms.domain.WmsSparePartsLedger; +import com.op.wms.domain.*; import com.op.wms.service.IBaseEquipmentService; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.springframework.beans.factory.annotation.Autowired; @@ -28,7 +26,6 @@ import org.springframework.web.bind.annotation.RestController; import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; import com.op.common.security.annotation.RequiresPermissions; -import com.op.wms.domain.BaseEquipment; import com.op.common.core.web.controller.BaseController; import com.op.common.core.web.domain.AjaxResult; import com.op.common.core.utils.poi.ExcelUtil; @@ -241,4 +238,14 @@ public class BaseEquipmentController extends BaseController { return getDataTable(list); } + /** + * 查询组线/辅助设备 + */ + @GetMapping("/getAuxiliaryEquipmentList") + public TableDataInfo getAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment) { + startPage(); + List list = baseEquipmentService.selectAuxiliaryEquipmentList(equBindAuxiliaryEquipment); + return getDataTable(list); + } + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java index bd505a4ee..d77bd1290 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseEquipmentMapper.java @@ -117,4 +117,7 @@ public interface BaseEquipmentMapper { //删除 void deleteAuxiliaryEquipmentByCode(String equipmentCode); + + //查询组线/辅助设备 + List selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java index a8180e81d..2c7860212 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseEquipmentService.java @@ -3,10 +3,7 @@ package com.op.wms.service; import java.util.List; import com.op.common.core.web.domain.AjaxResult; -import com.op.wms.domain.BaseEquipment; -import com.op.wms.domain.BaseTeamUser; -import com.op.wms.domain.EquSpareEquipment; -import com.op.wms.domain.WmsSparePartsLedger; +import com.op.wms.domain.*; /** * 设备管理Service接口 @@ -83,4 +80,7 @@ public interface IBaseEquipmentService { //查询人员列表 List getPersonList(BaseTeamUser baseTeamUser); + + //查询组线/辅助设备 + List selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java index 47942426f..e699f36ad 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseEquipmentServiceImpl.java @@ -335,10 +335,14 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService { EquBindAuxiliaryEquipment equBindAuxiliaryEquipment = new EquBindAuxiliaryEquipment(); equBindAuxiliaryEquipment.setAuxiliaryEquipmentCode(code); equBindAuxiliaryEquipment.setEquipmentCode(baseEquipment.getEquipmentCode()); + equBindAuxiliaryEquipment.setEquipmentName(baseEquipment.getEquipmentName()); equBindAuxiliaryEquipment.setCreateBy(SecurityUtils.getUsername()); equBindAuxiliaryEquipment.setCreateTime(DateUtils.getNowDate()); equBindAuxiliaryEquipment.setId(IdUtils.fastSimpleUUID()); - equBindAuxiliaryEquipment.setAuxiliaryEquipmentName(baseEquipment.getEquipmentName()); + //工厂号 + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String key = "#header.poolName"; + equBindAuxiliaryEquipment.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_","")); baseEquipmentMapper.bindAuxiliaryEquipment(equBindAuxiliaryEquipment); } } @@ -552,4 +556,16 @@ public class BaseEquipmentServiceImpl implements IBaseEquipmentService { return baseTeamUserMapper.getPersonList(baseTeamUser); } + /** + * 查询设备管理列表 + * + * @param equBindAuxiliaryEquipment 设备管理 + * @return 设备管理 + */ + @Override + @DS("#header.poolName") + public List selectAuxiliaryEquipmentList(EquBindAuxiliaryEquipment equBindAuxiliaryEquipment) { + return baseEquipmentMapper.selectAuxiliaryEquipmentList(equBindAuxiliaryEquipment); + } + } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml index c120ca673..6615e765d 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseEquipmentMapper.xml @@ -581,4 +581,15 @@ where equipment_id = #{equipmentId} + + + \ No newline at end of file