diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java index 659e1ddc..120b0dda 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java @@ -31,6 +31,8 @@ public class WarehouseStorageOrder extends BaseEntity @Excel(name = "关联订单号") private String relatedOrderCode; + private String qualityOrderCode; + /** 仓库入库状态(0待暂收、1已暂收、2待入库、3部分入库、4全部入库) */ @Excel(name = "仓库入库状态",dictType = "warehouse_storage_status") private String warehouseStorageStatus; @@ -363,6 +365,14 @@ public class WarehouseStorageOrder extends BaseEntity this.warehouseStorageOrderDetailList = warehouseStorageOrderDetailList; } + public String getQualityOrderCode() { + return qualityOrderCode; + } + + public void setQualityOrderCode(String qualityOrderCode) { + this.qualityOrderCode = qualityOrderCode; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml index 522a7fbd..993025dd 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" quality_qualified_num, quality_unqualified_num ,storage_num, arrived_time, temporary_time, delivery_inspection_time, quality_time, storage_time, warehouse_employee, warehouse_code, warehouse_name, warehouse_detail_address ,create_time, create_by, update_by, update_time, - make_in_total_price + make_in_total_price, quality_order_code from warehouse_storage_order @@ -88,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" warehouse_storage_code, related_order_code, + quality_order_code, warehouse_storage_status, warehouse_quality_status, warehouse_storage_type, @@ -118,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{warehouseStorageCode}, #{relatedOrderCode}, + #{qualityOrderCode}, #{warehouseStorageStatus}, #{warehouseQualityStatus}, #{warehouseStorageType}, @@ -152,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" warehouse_storage_code = #{warehouseStorageCode}, related_order_code = #{relatedOrderCode}, + quality_order_code = #{qualityOrderCode}, warehouse_storage_status = #{warehouseStorageStatus}, warehouse_quality_status = #{warehouseQualityStatus}, warehouse_storage_type = #{warehouseStorageType}, @@ -188,6 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" warehouse_storage_code = #{warehouseStorageCode}, related_order_code = #{relatedOrderCode}, + quality_order_code = #{qualityOrderCode}, warehouse_storage_status = #{warehouseStorageStatus}, warehouse_quality_status = #{warehouseQualityStatus}, warehouse_storage_type = #{warehouseStorageType},