diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index f11d4734..c275c37f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -5,6 +5,7 @@ package com.op.wms.controller; import com.op.common.core.utils.StringUtils; import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.web.page.TableDataInfo; import com.op.system.api.RemoteOpenService; import com.op.wms.domain.*; import com.op.wms.service.*; @@ -615,6 +616,12 @@ public class WmsToWCSmissionController { return success(odsProductEmbryoInventoryCorrelationList); } + //查询线体 + @PostMapping("/listBaseEquipment") + public AjaxResult listBaseEquipment(@RequestBody BaseEquipment baseEquipment) { + List list = wmsProductPutService.selectBaseEquipmentList(baseEquipment); + return success(list); + } /** diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java index 1de6f9b4..ebffa17b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java @@ -1,5 +1,6 @@ package com.op.wms.mapper; +import com.op.wms.domain.BaseEquipment; import com.op.wms.domain.WmsRuturnPutEmbryo; import java.util.List; @@ -23,4 +24,6 @@ public interface WmsRuturnPutEmbryoMapper { public List selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo); void insertWmsRuturnPutEmbryo(WmsRuturnPutEmbryo wmsRuturnPutEmbryo1); + + List selectBaseEquipmentList(BaseEquipment baseEquipment); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index f9954c3a..bd910f3b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -130,4 +130,6 @@ public interface IWmsProductPutService { List selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo); String finishedProductSalesReturnTD(WmsRuturnPutEmbryo wmsRuturnPutEmbryo); + + List selectBaseEquipmentList(BaseEquipment baseEquipment); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index bcf01c55..04b66376 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -982,6 +982,14 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } return results; } + + @Override + public List selectBaseEquipmentList(BaseEquipment baseEquipment) { + DynamicDataSourceContextHolder.push("ds_" + baseEquipment.getFactoryCode()); + List baseEquipments = wmsRuturnPutEmbryoMapper.selectBaseEquipmentList(baseEquipment); + return baseEquipments; + } + @Override public List FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml index d16d7d81..d854285d 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml @@ -387,4 +387,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +