From 8daa2ea52042e76d3bba6f7421895ea606566fb4 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Sat, 10 Sep 2022 10:50:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=99=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E5=BA=93=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ktg/common/constant/UserConstants.java | 8 +++++ .../controller/MdWorkstationController.java | 3 ++ .../mes/wm/service/IWmWarehouseService.java | 6 ++++ .../service/impl/WmWarehouseServiceImpl.java | 33 +++++++++++++++++++ 4 files changed, 50 insertions(+) diff --git a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java index af08657..2d308a7 100644 --- a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java +++ b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java @@ -165,4 +165,12 @@ public class UserConstants public static final String QC_TYPE_IQC = "IQC"; //来料检验单 public static final String QC_TYPE_IPQC = "IPQC"; //过程检验单 public static final String QC_TYPE_OQC = "OQC"; //出货检验 + + /** + * 默认线边库对应的仓库、库区、库位编码 + */ + public static final String VIRTUAL_WH ="XBK_VIRTUAL"; + public static final String VIRTUAL_WS ="XBKKQ_VIRTUAL"; + public static final String VIRTUAL_WA ="XBKKW_VIRTUAL"; + } diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java index 192dc56..ab1b874 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/MdWorkstationController.java @@ -147,10 +147,13 @@ public class MdWorkstationController extends BaseController location = wmStorageLocationService.selectWmStorageLocationByLocationCode(UserConstants.VIRTUAL_WS); area = wmStorageAreaService.selectWmStorageAreaByAreaCode(UserConstants.VIRTUAL_WA); } + mdWorkstation.setWarehouseId(warehouse.getWarehouseId()); mdWorkstation.setWarehouseCode(warehouse.getWarehouseCode()); mdWorkstation.setWorkstationName(warehouse.getWarehouseName()); + mdWorkstation.setLocationId(location.getLocationId()); mdWorkstation.setLocationCode(location.getLocationCode()); mdWorkstation.setLocationName(location.getLocationName()); + mdWorkstation.setAreaId(area.getAreaId()); mdWorkstation.setAreaCode(area.getAreaCode()); mdWorkstation.setAreaName(area.getAreaName()); diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java index a294d3d..7395d7d 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java @@ -81,4 +81,10 @@ public interface IWmWarehouseService * @return 结果 */ public int deleteWmWarehouseByWarehouseId(Long warehouseId); + + /** + * 初始化虚拟的线边库 + * @return + */ + public WmWarehouse initVirtualWarehouse(); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java index 8ed061f..9892cba 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java @@ -5,7 +5,12 @@ import java.util.List; import com.ktg.common.constant.UserConstants; import com.ktg.common.utils.DateUtils; import com.ktg.common.utils.StringUtils; +import com.ktg.mes.wm.domain.WmStorageArea; +import com.ktg.mes.wm.domain.WmStorageLocation; +import com.ktg.mes.wm.mapper.WmStorageAreaMapper; +import com.ktg.mes.wm.mapper.WmStorageLocationMapper; import org.apache.catalina.User; +import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ktg.mes.wm.mapper.WmWarehouseMapper; @@ -24,6 +29,12 @@ public class WmWarehouseServiceImpl implements IWmWarehouseService @Autowired private WmWarehouseMapper wmWarehouseMapper; + @Autowired + private WmStorageLocationMapper wmStorageLocationMapper; + + @Autowired + private WmStorageAreaMapper wmStorageAreaMapper; + /** * 查询仓库设置 * @@ -127,4 +138,26 @@ public class WmWarehouseServiceImpl implements IWmWarehouseService { return wmWarehouseMapper.deleteWmWarehouseByWarehouseId(warehouseId); } + + @Override + public WmWarehouse initVirtualWarehouse() { + WmWarehouse warehouse = new WmWarehouse(); + warehouse.setWarehouseCode(UserConstants.VIRTUAL_WH); + warehouse.setWarehouseName("线边库-虚拟"); + wmWarehouseMapper.insertWmWarehouse(warehouse); + + WmStorageLocation location = new WmStorageLocation(); + location.setWarehouseId(warehouse.getWarehouseId()); + location.setLocationCode(UserConstants.VIRTUAL_WS); + location.setLocationName("线边库库区-虚拟"); + location.setAreaFlag(UserConstants.YES); + wmStorageLocationMapper.insertWmStorageLocation(location); + + WmStorageArea area = new WmStorageArea(); + area.setLocationId(location.getLocationId()); + area.setAreaCode(UserConstants.VIRTUAL_WA); + area.setAreaName("线边库库位-虚拟"); + wmStorageAreaMapper.insertWmStorageArea(area); + return warehouse; + } }