From 0e249df6f3811bf3e39c6c7f644dbc081b374de8 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 29 Aug 2024 14:19:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E6=9D=90=E5=85=A5=E5=BA=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/wms/controller/WmsToWCSmissionController.java | 7 +++++-- .../main/java/com/op/wms/mapper/BaseAreaMapper.java | 3 +++ .../main/java/com/op/wms/service/IBaseAreaService.java | 2 +- .../com/op/wms/service/impl/BaseAreaServiceImpl.java | 5 +++-- .../src/main/resources/mapper/wms/BaseAreaMapper.xml | 10 ++++++++++ 5 files changed, 22 insertions(+), 5 deletions(-) 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 e0c50ebbb..d97aaa752 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 @@ -778,8 +778,11 @@ public class WmsToWCSmissionController { */ @PostMapping("/listTableCK") public AjaxResult listTableCK(@RequestBody BaseArea baseArea) { - List list = baseAreaService.listTableCK(baseArea); - return success(list); + BaseWarehouse baseWarehouse = baseAreaService.listTableCK(baseArea); + return success(baseWarehouse); } + //扫码物料标识卡 + + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseAreaMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseAreaMapper.java index 43e5af0af..e82d195d0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseAreaMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseAreaMapper.java @@ -3,6 +3,7 @@ package com.op.wms.mapper; import java.util.List; import com.op.wms.domain.BaseArea; +import com.op.wms.domain.BaseWarehouse; /** * 库区Mapper接口 @@ -64,4 +65,6 @@ public interface BaseAreaMapper { public String checkAreaCodeUnique(BaseArea baseArea); public String checkAreaDescUnique(BaseArea baseArea); + + BaseWarehouse selectBaseWarehouse(BaseArea baseArea); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseAreaService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseAreaService.java index efc32c938..3035a5910 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseAreaService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseAreaService.java @@ -66,5 +66,5 @@ public interface IBaseAreaService { List selectBaseAreaListSC(BaseArea baseArea); - List listTableCK(BaseArea baseArea); + BaseWarehouse listTableCK(BaseArea baseArea); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseAreaServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseAreaServiceImpl.java index 43abf5277..a47c703b4 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseAreaServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseAreaServiceImpl.java @@ -142,9 +142,10 @@ public class BaseAreaServiceImpl implements IBaseAreaService { } @Override - public List listTableCK(BaseArea baseArea) { + public BaseWarehouse listTableCK(BaseArea baseArea) { DynamicDataSourceContextHolder.push("ds_" + baseArea.getFactoryCode()); - return null; + BaseWarehouse baseWarehouse= baseAreaMapper.selectBaseWarehouse(baseArea); + return baseWarehouse; } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseAreaMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseAreaMapper.xml index c51f16bfd..522ef0ad7 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseAreaMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseAreaMapper.xml @@ -231,5 +231,15 @@ where area_desc = #{areaDesc} and del_flag = '0' +