From f06c210ae965d323e3120a74f8977493c0db95da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 6 Aug 2026 16:40:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/warehouse/entity/Warehouse.java | 16 ++++++++++++++++ .../warehouse/repository/po/WarehousePO.java | 17 +++++++++++++++++ .../warehouse/repository/todo/WarehouseDO.java | 17 +++++++++++++++++ .../interfaces/dto/warehouse/WarehouseDTO.java | 17 +++++++++++++++++ .../mapper/basic/warehouse/WarehouseMapper.xml | 7 ++++++- 5 files changed, 73 insertions(+), 1 deletion(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/entity/Warehouse.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/entity/Warehouse.java index 4564aa5b9..831fb5a50 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/entity/Warehouse.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/entity/Warehouse.java @@ -130,4 +130,20 @@ public class Warehouse extends BaseVOEntity{ @Excel(name = "作业模式") private String workMode; + @ApiModelProperty("订单号生成规则") + @Excel(name = "单号生成规则") + private String orderNoGenerateRule; + + @ApiModelProperty("入库单号首字母前缀") + @Excel(name = "入库单号首字母前缀") + private String inOrderNoPrefix; + + @ApiModelProperty("出库单号首字母前缀") + @Excel(name = "出库单号首字母前缀") + private String outOrderNoPrefix; + + @ApiModelProperty("样品出库单号首字母前缀") + @Excel(name = "样品出库单号首字母前缀") + private String sampleOutOrderNoPrefix; + } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/po/WarehousePO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/po/WarehousePO.java index 1127d377d..e1b5f239d 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/po/WarehousePO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/po/WarehousePO.java @@ -131,4 +131,21 @@ public class WarehousePO extends BaseVOEntity{ @ApiModelProperty("作业模式") @Excel(name = "作业模式") private String workMode; + + + @ApiModelProperty("订单号生成规则") + @Excel(name = "单号生成规则") + private String orderNoGenerateRule; + + @ApiModelProperty("入库单号首字母前缀") + @Excel(name = "入库单号首字母前缀") + private String inOrderNoPrefix; + + @ApiModelProperty("出库单号首字母前缀") + @Excel(name = "出库单号首字母前缀") + private String outOrderNoPrefix; + + @ApiModelProperty("样品出库单号首字母前缀") + @Excel(name = "样品出库单号首字母前缀") + private String sampleOutOrderNoPrefix; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/todo/WarehouseDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/todo/WarehouseDO.java index 097528ef2..2c0359c90 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/todo/WarehouseDO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/warehouse/repository/todo/WarehouseDO.java @@ -139,4 +139,21 @@ public class WarehouseDO extends BaseVOEntity{ @ApiModelProperty("作业模式") @Excel(name = "作业模式") private String workMode; + + + @ApiModelProperty("订单号生成规则") + @Excel(name = "单号生成规则") + private String orderNoGenerateRule; + + @ApiModelProperty("入库单号首字母前缀") + @Excel(name = "入库单号首字母前缀") + private String inOrderNoPrefix; + + @ApiModelProperty("出库单号首字母前缀") + @Excel(name = "出库单号首字母前缀") + private String outOrderNoPrefix; + + @ApiModelProperty("样品出库单号首字母前缀") + @Excel(name = "样品出库单号首字母前缀") + private String sampleOutOrderNoPrefix; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/warehouse/WarehouseDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/warehouse/WarehouseDTO.java index 8b1b164aa..ce7bbeecb 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/warehouse/WarehouseDTO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/warehouse/WarehouseDTO.java @@ -144,4 +144,21 @@ public class WarehouseDTO extends BaseVOEntity{ @ApiModelProperty("作业模式") @Excel(name = "作业模式") private String workMode; + + + @ApiModelProperty("订单号生成规则") + @Excel(name = "单号生成规则") + private String orderNoGenerateRule; + + @ApiModelProperty("入库单号首字母前缀") + @Excel(name = "入库单号首字母前缀") + private String inOrderNoPrefix; + + @ApiModelProperty("出库单号首字母前缀") + @Excel(name = "出库单号首字母前缀") + private String outOrderNoPrefix; + + @ApiModelProperty("样品出库单号首字母前缀") + @Excel(name = "样品出库单号首字母前缀") + private String sampleOutOrderNoPrefix; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml index ec3402469..fe8b9fbe0 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml @@ -39,6 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -47,7 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" warehouse_type, warehouse_type_name, warehouse_structure, warehouse_nature, warm_layer_code, warm_layer_name, director_name, director_phone, region_code, region_name, detail_address, longitude, latitude, building_region, usage_region, remark, opening_up, nullify, create_time, create_by, create_by_name, update_time, update_by, - update_by_name, del_flag, IS_ENABLE ,WORK_MODE,TASK_MODE + update_by_name, del_flag, IS_ENABLE ,WORK_MODE,TASK_MODE,SAMPLE_OUT_ORDER_NO_PREFIX,ORDER_NO_GENERATE_RULE,IN_ORDER_NO_PREFIX, + OUT_ORDER_NO_PREFIX from warehouse