Browse Source

[feat]

仓库管理 入库单
修改入库单对象,新增品质单号字段;
修改入库单mapper相关方法,新增品质单号字段;
dev
王晓迪 3 days ago
parent
commit
a43d44d397
  1. 10
      ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java
  2. 7
      ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml

10
ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java

@ -31,6 +31,8 @@ public class WarehouseStorageOrder extends BaseEntity
@Excel(name = "关联订单号") @Excel(name = "关联订单号")
private String relatedOrderCode; private String relatedOrderCode;
private String qualityOrderCode;
/** 仓库入库状态(0待暂收、1已暂收、2待入库、3部分入库、4全部入库) */ /** 仓库入库状态(0待暂收、1已暂收、2待入库、3部分入库、4全部入库) */
@Excel(name = "仓库入库状态",dictType = "warehouse_storage_status") @Excel(name = "仓库入库状态",dictType = "warehouse_storage_status")
private String warehouseStorageStatus; private String warehouseStorageStatus;
@ -363,6 +365,14 @@ public class WarehouseStorageOrder extends BaseEntity
this.warehouseStorageOrderDetailList = warehouseStorageOrderDetailList; this.warehouseStorageOrderDetailList = warehouseStorageOrderDetailList;
} }
public String getQualityOrderCode() {
return qualityOrderCode;
}
public void setQualityOrderCode(String qualityOrderCode) {
this.qualityOrderCode = qualityOrderCode;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

7
ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml

@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="warehouseStorageId" column="warehouse_storage_id" /> <result property="warehouseStorageId" column="warehouse_storage_id" />
<result property="warehouseStorageCode" column="warehouse_storage_code" /> <result property="warehouseStorageCode" column="warehouse_storage_code" />
<result property="relatedOrderCode" column="related_order_code" /> <result property="relatedOrderCode" column="related_order_code" />
<result property="qualityOrderCode" column="quality_order_code" />
<result property="warehouseStorageStatus" column="warehouse_storage_status" /> <result property="warehouseStorageStatus" column="warehouse_storage_status" />
<result property="warehouseQualityStatus" column="warehouse_quality_status" /> <result property="warehouseQualityStatus" column="warehouse_quality_status" />
<result property="warehouseStorageType" column="warehouse_storage_type" /> <result property="warehouseStorageType" column="warehouse_storage_type" />
@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
quality_qualified_num, quality_unqualified_num ,storage_num, arrived_time, temporary_time, quality_qualified_num, quality_unqualified_num ,storage_num, arrived_time, temporary_time,
delivery_inspection_time, quality_time, storage_time, warehouse_employee, warehouse_code, delivery_inspection_time, quality_time, storage_time, warehouse_employee, warehouse_code,
warehouse_name, warehouse_detail_address ,create_time, create_by, update_by, update_time, 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 from warehouse_storage_order
</sql> </sql>
@ -88,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="warehouseStorageCode != null">warehouse_storage_code,</if> <if test="warehouseStorageCode != null">warehouse_storage_code,</if>
<if test="relatedOrderCode != null">related_order_code,</if> <if test="relatedOrderCode != null">related_order_code,</if>
<if test="qualityOrderCode != null">quality_order_code,</if>
<if test="warehouseStorageStatus != null">warehouse_storage_status,</if> <if test="warehouseStorageStatus != null">warehouse_storage_status,</if>
<if test="warehouseQualityStatus != null">warehouse_quality_status,</if> <if test="warehouseQualityStatus != null">warehouse_quality_status,</if>
<if test="warehouseStorageType != null">warehouse_storage_type,</if> <if test="warehouseStorageType != null">warehouse_storage_type,</if>
@ -118,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="warehouseStorageCode != null">#{warehouseStorageCode},</if> <if test="warehouseStorageCode != null">#{warehouseStorageCode},</if>
<if test="relatedOrderCode != null">#{relatedOrderCode},</if> <if test="relatedOrderCode != null">#{relatedOrderCode},</if>
<if test="qualityOrderCode != null">#{qualityOrderCode},</if>
<if test="warehouseStorageStatus != null">#{warehouseStorageStatus},</if> <if test="warehouseStorageStatus != null">#{warehouseStorageStatus},</if>
<if test="warehouseQualityStatus != null">#{warehouseQualityStatus},</if> <if test="warehouseQualityStatus != null">#{warehouseQualityStatus},</if>
<if test="warehouseStorageType != null">#{warehouseStorageType},</if> <if test="warehouseStorageType != null">#{warehouseStorageType},</if>
@ -152,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="warehouseStorageCode != null">warehouse_storage_code = #{warehouseStorageCode},</if> <if test="warehouseStorageCode != null">warehouse_storage_code = #{warehouseStorageCode},</if>
<if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if> <if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if>
<if test="qualityOrderCode != null">quality_order_code = #{qualityOrderCode},</if>
<if test="warehouseStorageStatus != null">warehouse_storage_status = #{warehouseStorageStatus},</if> <if test="warehouseStorageStatus != null">warehouse_storage_status = #{warehouseStorageStatus},</if>
<if test="warehouseQualityStatus != null">warehouse_quality_status = #{warehouseQualityStatus},</if> <if test="warehouseQualityStatus != null">warehouse_quality_status = #{warehouseQualityStatus},</if>
<if test="warehouseStorageType != null">warehouse_storage_type = #{warehouseStorageType},</if> <if test="warehouseStorageType != null">warehouse_storage_type = #{warehouseStorageType},</if>
@ -188,6 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="warehouseStorageCode != null">warehouse_storage_code = #{warehouseStorageCode},</if> <if test="warehouseStorageCode != null">warehouse_storage_code = #{warehouseStorageCode},</if>
<if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if> <if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if>
<if test="qualityOrderCode != null">quality_order_code = #{qualityOrderCode},</if>
<if test="warehouseStorageStatus != null">warehouse_storage_status = #{warehouseStorageStatus},</if> <if test="warehouseStorageStatus != null">warehouse_storage_status = #{warehouseStorageStatus},</if>
<if test="warehouseQualityStatus != null">warehouse_quality_status = #{warehouseQualityStatus},</if> <if test="warehouseQualityStatus != null">warehouse_quality_status = #{warehouseQualityStatus},</if>
<if test="warehouseStorageType != null">warehouse_storage_type = #{warehouseStorageType},</if> <if test="warehouseStorageType != null">warehouse_storage_type = #{warehouseStorageType},</if>

Loading…
Cancel
Save