解决DTO

2026-01-23 15:54:22 +08:00
parent 254fa94512
commit b3eb3f9963
1 changed files with 194 additions and 0 deletions
@@ -0,0 +1,194 @@
+package com.mhd.wms.interfaces.dto.stockInOrder;
+
+import com.mhd.common.core.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 入库单导入行DTO（一个Excel行=一个明细行；表头字段可重复）
+ *
+ * 约定：以【委托编号NO】作为同一张入库单的分组键（同一个委托编号可导入多条物料明细）
+ */
+@Data
+public class StockInOrderImportRowDTO {
+
+    // ====== 分组/表头基础字段（建议在Excel中每行重复填写） ======
+    // @Excel(name = "仓库ID")
+    // private Long warehouseId;
+
+    // @Excel(name = "货主ID")
+    // private Long shipperId;
+
+    // @Excel(name = "供应商ID")
+    // private Long supplierId;
+
+    // @Excel(name = "入库单据类型")
+    // private String orderTypeCode;
+
+    @Excel(name = "委托编号NO")
+    private String consignmentNo;
+
+    // ====== 表头报关字段（与页面一致） ======
+    @Excel(name = "To")
+    private String to;
+
+    @Excel(name = "联系人")
+    private String contactPerson;
+
+    @Excel(name = "车型及车牌")
+    private String vehicleInfo;
+
+    @Excel(name = "Tel")
+    private String tel;
+
+    @Excel(name = "司机签名")
+    private String driverSignature;
+
+    @Excel(name = "Fax")
+    private String fax;
+
+    @Excel(name = "申报地关区")
+    private String declarationArea;
+
+    @Excel(name = "生产商")
+    private String manufacturer;
+
+    @Excel(name = "报关员姓名及联系方式")
+    private String customsBrokerInfo;
+
+    @Excel(name = "送货地址")
+    private String deliveryAddress;
+
+    @Excel(name = "进出境关别")
+    private String entryExitCustoms;
+
+    @Excel(name = "起运/运抵国(地区)")
+    private String originDestinationCountry;
+
+    // 客户名称只在表头中，明细行不需要此字段（代码会从表头读取并应用到此字段）
+    @Excel(name = "客户名称")
+    private String customerName;
+
+    @Excel(name = "承运商")
+    private String carrier;
+
+    @Excel(name = "柜号")
+    private String containerNo;
+
+    @Excel(name = "运输方式")
+    private String transportMethod;
+
+    @Excel(name = "监管方式")
+    private String supervisionMethod;
+
+    @Excel(name = "海关是否查验货物")
+    private Integer customsInspection;
+
+    @Excel(name = "是否需要报关")
+    private Integer needCustomsDeclaration;
+
+    @Excel(name = "是否需要运输")
+    private Integer needTransport;
+
+    @Excel(name = "入仓日期")
+    private String warehouseDate; // 导入先按字符串，后端可根据需要转Date（当前入库单服务未强制使用）
+
+    @Excel(name = "完成时间")
+    private String completionTime;
+
+    @Excel(name = "下单日期")
+    private String orderDate;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    // ====== 明细字段（一个Excel行=一个明细） ======
+    @Excel(name = "序号")
+    private Integer serialNumber;
+
+    @Excel(name = "商品名称")
+    private String materialName;
+
+    @Excel(name = "料号")
+    private String materialCode;
+
+    // @Excel(name = "物料基础信息ID")
+    // private Long materialBaseInfoId;
+
+    // 模板中没有此字段，注释掉
+    // @Excel(name = "计划数量")
+    private BigDecimal quantity;
+
+    @Excel(name = "仓库数量")
+    private BigDecimal warehouseQuantity;
+
+    @Excel(name = "规格型号/ITEM")
+    private String specificationModel;
+
+    @Excel(name = "SKU码")
+    private String skuCode;
+
+    @Excel(name = "Invoice No.")
+    private String invoiceNo;
+
+    @Excel(name = "申报数量")
+    private BigDecimal declaredQuantity;
+
+    @Excel(name = "申报单位")
+    private String declarationUnit;
+
+    @Excel(name = "升")
+    private BigDecimal liter;
+
+    @Excel(name = "箱数")
+    private BigDecimal boxCount;
+
+    @Excel(name = "件数")
+    private BigDecimal pieceCount;
+
+    @Excel(name = "尺寸")
+    private String dimensions;
+
+    // @Excel(name = "出库数量")
+    private BigDecimal outboundQuantity;
+
+    // 模板中没有此字段，注释掉
+    // @Excel(name = "单位")
+    private String unit;
+
+    @Excel(name = "总净重(KG)")
+    private BigDecimal totalNetWeight;
+
+    @Excel(name = "总毛重(KG)")
+    private BigDecimal totalGrossWeight;
+
+    @Excel(name = "总体积(CBM)")
+    private BigDecimal totalVolume;
+
+    @Excel(name = "总面积(SQM)")
+    private BigDecimal totalArea;
+
+    @Excel(name = "Batch Ref NO's")
+    private String batchRefNo;
+
+    @Excel(name = "Sheet Ref NO's")
+    private String sheetRefNo;
+
+    @Excel(name = "原产国")
+    private String originCountry;
+
+    @Excel(name = "箱号/卡板号")
+    private String boxPalletNo;
+
+    @Excel(name = "总价")
+    private BigDecimal totalPrice;
+
+    @Excel(name = "币制")
+    private String currency;
+
+    @Excel(name = "备注")
+    private String detailRemark;
+}
+
+