weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

Browse Source
This commit is contained in:
zhou-hongcheng
2026-04-17 11:05:23 +08:00
parent b86374786f 290b87933e
commit 7cc2081ad3
26 changed files with 581 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java
+4
View File
@@ -357,17 +357,21 @@ public class ShelfMaterialDetail extends BaseVOEntity {
@ApiModelProperty("抄码托盘号")
@Excel(name = "抄码托盘号")
@TableField("pallet_number")
private String palletNumber;
@ApiModelProperty("抄码批次号")
@Excel(name = "抄码批次号")
@TableField("copy_batch")
private String copyBatch;
@ApiModelProperty("抄码数量")
@Excel(name = "抄码数量")
@TableField("copy_quantity")
private String copyQuantity;
@ApiModelProperty("抄码数量克重详情")
@Excel(name = "抄码数量克重详情")
@TableField("copy_details")
private String copyDetails;
}
mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java
+16
View File
@@ -357,7 +357,23 @@ public class ShelfMaterialDetailPO extends BaseVOEntity {
@Excel(name = "LOT编号")
private String lotNumber;
@ApiModelProperty("抄码托盘号")
@Excel(name = "抄码托盘号")
private String palletNumber;
@ApiModelProperty("是否抄码: 1-是 2-否")
@Excel(name = "是否抄码: 1-是 2-否")
private Integer copyCode;
@ApiModelProperty("抄码批次号")
@Excel(name = "抄码批次号")
private String copyBatch;
@ApiModelProperty("抄码数量")
@Excel(name = "抄码数量")
private String copyQuantity;
@ApiModelProperty("抄码克重明细 JSON")
@Excel(name = "抄码克重明细")
private String copyDetails;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shelfMaterialDetail/ShelfMaterialDetailDTO.java
+9
View File
@@ -1,5 +1,6 @@
package com.mhd.wms.interfaces.dto.shelfMaterialDetail;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -337,4 +338,12 @@ public class ShelfMaterialDetailDTO extends BaseVOEntity {
@ApiModelProperty("总面积(SQM)")
@Excel(name = "总面积(SQM)")
private BigDecimal totalArea;
@ApiModelProperty("抄码托盘号")
@Excel(name = "抄码托盘号")
private String palletNumber;
@ApiModelProperty("抄码批次号")
@Excel(name = "抄码批次号")
private String copyBatch;
}
mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml
+8 -1
View File
@@ -71,6 +71,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="totalArea" column="total_area" />
<result property="inOrderNumber" column="in_order_number" />
<result property="lotNumber" column="lot_number" />
<result property="palletNumber" column="pallet_number" />
<result property="copyBatch" column="copy_batch" />
<result property="copyQuantity" column="copy_quantity" />
<result property="copyDetails" column="copy_details" />
<result property="alreadyShelvesArea" column="total_area" />
</resultMap>
@@ -80,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
CASE
WHEN pack_detail_id IS NULL OR TRIM(pack_detail_id) = '' THEN NULL
ELSE CAST(pack_detail_id AS BIGINT)
END as pack_detail_id, unit_code, unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, quality_inspection_rule, quality_inspection_ratio, quality_inspection_term, quality_inspection_results, allow_overcharge, overcharge_ratio, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id, container_code, container_type, container_type_name, warehouse_id, warehouse_code, warehouse_name, storage_section_id, storage_code, storage_name, storage_location_id, storage_location_code, storage_location_name, level, parent_unique_id, in_unique_id, receipt_unique_id, allow_modify, remark, batch_ref_no, sheet_ref_no, box_pallet_no, ext_attr_1, ext_attr_2, production_date, expiry_date, inventory_date, ext_attr_3, ext_attr_4, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,total_net_weight,total_gross_weight,total_volume,total_area,in_order_number,lot_number from shelf_material_detail
END as pack_detail_id, unit_code, unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, quality_inspection_rule, quality_inspection_ratio, quality_inspection_term, quality_inspection_results, allow_overcharge, overcharge_ratio, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id, container_code, container_type, container_type_name, warehouse_id, warehouse_code, warehouse_name, storage_section_id, storage_code, storage_name, storage_location_id, storage_location_code, storage_location_name, level, parent_unique_id, in_unique_id, receipt_unique_id, allow_modify, remark, batch_ref_no, sheet_ref_no, box_pallet_no, ext_attr_1, ext_attr_2, production_date, expiry_date, inventory_date, ext_attr_3, ext_attr_4, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,total_net_weight,total_gross_weight,total_volume,total_area,in_order_number,lot_number,pallet_number,copy_batch,copy_quantity,copy_details from shelf_material_detail
</sql>
<sql id="selectShelfMaterialDetailPo1">
@@ -181,6 +185,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lotNumber != null and lotNumber != ''">
and lot_number = #{lotNumber}
</if>
<if test="palletNumber != null and palletNumber != ''">
and pallet_number like concat('%', #{palletNumber}, '%')
</if>
<if test="materialStatusCode != null and materialStatusCode != ''">
and material_status_code = #{materialStatusCode}
</if>