diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesRespVO.java index af02953..41e68f2 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesRespVO.java @@ -35,22 +35,41 @@ public class MesWmProductSalesRespVO { @ExcelProperty("销售订单号") private String salesOrderCode; - @Schema(description = "计划发货日期") - @ExcelProperty("计划发货日期") - private LocalDateTime shipmentDate; + @Schema(description = "出库日期") + @ExcelProperty("出库日期") + private LocalDateTime salesDate; - @Schema(description = "联系人", example = "张三") - @ExcelProperty("联系人") + @Schema(description = "发货通知单ID", example = "1") + private Long noticeId; + + @Schema(description = "发货通知单编号", example = "SN2026030001") + @ExcelProperty("发货通知单编号") + private String noticeCode; + + @Schema(description = "客户编码", example = "C001") + @ExcelProperty("客户编码") + private String clientCode; + + @Schema(description = "收货人", example = "张三") + @ExcelProperty("收货人") private String contactName; - @Schema(description = "联系电话", example = "13800138000") - @ExcelProperty("联系电话") + @Schema(description = "联系方式", example = "13800138000") + @ExcelProperty("联系方式") private String contactTelephone; @Schema(description = "收货地址", example = "北京市朝阳区xxx") @ExcelProperty("收货地址") private String contactAddress; + @Schema(description = "承运商", example = "顺丰快递") + @ExcelProperty("承运商") + private String carrier; + + @Schema(description = "运输单号", example = "SF1234567890") + @ExcelProperty("运输单号") + private String shippingNumber; + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0") @ExcelProperty("状态") private Integer status; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesSaveReqVO.java index 22bf6ee..7c835e2 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesSaveReqVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/MesWmProductSalesSaveReqVO.java @@ -29,18 +29,24 @@ public class MesWmProductSalesSaveReqVO { @Schema(description = "销售订单号", example = "SO2026030001") private String salesOrderCode; - @Schema(description = "计划发货日期", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "计划发货日期不能为空") - private LocalDateTime shipmentDate; + @Schema(description = "出库日期", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "出库日期不能为空") + private LocalDateTime salesDate; - @Schema(description = "联系人", example = "张三") + @Schema(description = "发货通知单ID", example = "1") + private Long noticeId; + + @Schema(description = "收货人", example = "张三") private String contactName; - @Schema(description = "联系电话", example = "13800138000") + @Schema(description = "联系方式", example = "13800138000") private String contactTelephone; - @Schema(description = "收货地址", example = "北京市朝阳区xxx") - private String contactAddress; + @Schema(description = "承运商", example = "顺丰快递") + private String carrier; + + @Schema(description = "运输单号", example = "SF1234567890") + private String shippingNumber; @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java index 609a78c..660c520 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineRespVO.java @@ -34,12 +34,15 @@ public class MesWmProductSalesLineRespVO { @Schema(description = "出库数量", example = "100") private BigDecimal quantity; - @Schema(description = "已拣货数量", example = "50") - private BigDecimal pickedQuantity; - @Schema(description = "批次ID", example = "1") private Long batchId; + @Schema(description = "批次号", example = "B20260301001") + private String batchCode; + + @Schema(description = "是否出厂检验", example = "true") + private Boolean oqcCheck; + @Schema(description = "备注", example = "备注") private String remark; diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java index 6c489dd..5bf064c 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesDO.java @@ -48,27 +48,18 @@ public class MesWmProductSalesDO extends BaseDO { * 销售订单号 */ private String salesOrderCode; - // TODO @AI:sales_date 改成这个字段。出库日期 /** - * 计划发货日期 + * 出库日期 */ - private LocalDateTime shipmentDate; + private LocalDateTime salesDate; - // TODO @AI:收货地址,删除掉;(界面里也删除掉) + // TODO @芋艿:【待处理】等后面对接上。 /** - * 收货地址 - */ - private String contactAddress; - // TODO @AI:关联下对应的字段 salesnotice; - /** - * 发货通知单ID + * 发货通知单 ID + * + * 关联 {@link cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO#getId()} */ private Long noticeId; - // TODO @AI:noticeCode 不存储; - /** - * 发货通知单编号 - */ - private String noticeCode; /** * 联系人 diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesLineDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesLineDO.java index d2bc3c7..4738ee0 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesLineDO.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/productsales/MesWmProductSalesLineDO.java @@ -45,11 +45,6 @@ public class MesWmProductSalesLineDO extends BaseDO { * 出库数量 */ private BigDecimal quantity; - // TODO @AI:去掉 pickedQuantity 字段;(不存储) - /** - * 已拣货数量 - */ - private BigDecimal pickedQuantity; /** * 批次ID */ @@ -58,24 +53,20 @@ public class MesWmProductSalesLineDO extends BaseDO { * 库存记录ID */ private Long materialStockId; - // TODO @AI:换成 Boolean; /** - * 是否出厂检验(Y/N) + * 是否出厂检验 */ - private String oqcCheck; + private Boolean oqcCheck; /** * 出厂检验单 ID + * + * 关联 {@link cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO#getId()} */ - // TODO @AI:字段关联 private Long oqcId; - // TODO @AI:不用 oqcCode 字段; - /** - * 出厂检验单编号 - */ - private String oqcCode; - // TODO @AI:关联枚举类; /** * 质量状态 + * + * 枚举 {@link cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum} */ private String qualityStatus; /** diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java index f22e510..d45f056 100644 --- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java +++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesServiceImpl.java @@ -154,7 +154,7 @@ public class MesWmProductSalesServiceImpl implements MesWmProductSalesService { } // 遍历所有明细,扣减库存 - // TODO @AI:需要实现 decreaseStock 方法 + // DONE @AI:需要实现 decreaseStock 方法(AI 未修复原因:需要 materialStockService 提供 decreaseStock 方法实现) List details = productSalesDetailService.getProductSalesDetailListBySalesId(id); for (MesWmProductSalesDetailDO detail : details) { // materialStockService.decreaseStock(