From dddd2f3fe6264e38ea627aed74c3fe8304d223a2 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 25 Nov 2025 17:42:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E6=AD=A3=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E4=B8=8E=E6=98=8E=E7=BB=86=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91=E5=8F=8A=E9=87=8D=E9=87=8F?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了 WmsDeliveryWaybillBo 中所有字段的非空校验注解 - 移除了 WmsDeliveryWaybillDetailBo 中所有字段的非空校验注解 - 修正了 WmsDeliveryPlanMapper.xml 中 total_weight 的计算方式， 由 SUM(weight/1000.0) 改为 SUM(weight) --- .../com/klp/domain/bo/WmsDeliveryWaybillBo.java | 14 -------------- .../klp/domain/bo/WmsDeliveryWaybillDetailBo.java | 15 --------------- .../mapper/klp/WmsDeliveryPlanMapper.xml | 2 +- 3 files changed, 1 insertion(+), 30 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryWaybillBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryWaybillBo.java index e6cd2b74..1b9c9d0e 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryWaybillBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryWaybillBo.java @@ -24,85 +24,71 @@ public class WmsDeliveryWaybillBo extends BaseEntity { /** * 发货单唯一ID */ - @NotNull(message = "发货单唯一ID不能为空", groups = { EditGroup.class }) private Long waybillId; /** * 发货单编号（格式：WB-YYYYMMDD-XXXX，如WB-20251125-0001） */ - @NotBlank(message = "发货单编号（格式：WB-YYYYMMDD-XXXX，如WB-20251125-0001）不能为空", groups = { AddGroup.class, EditGroup.class }) private String waybillNo; /** * 发货单名称 */ - @NotBlank(message = "发货单名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String waybillName; /** * 关联发货计划ID */ - @NotNull(message = "关联发货计划ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long planId; /** * 车牌（支持新能源车牌） */ - @NotBlank(message = "车牌（支持新能源车牌）不能为空", groups = { AddGroup.class, EditGroup.class }) private String licensePlate; /** * 收货单位 */ - @NotBlank(message = "收货单位不能为空", groups = { AddGroup.class, EditGroup.class }) private String consigneeUnit; /** * 发货单位 */ - @NotBlank(message = "发货单位不能为空", groups = { AddGroup.class, EditGroup.class }) private String senderUnit; /** * 发货时间 */ - @NotNull(message = "发货时间不能为空", groups = { AddGroup.class, EditGroup.class }) private Date deliveryTime; /** * 磅房 */ - @NotBlank(message = "磅房不能为空", groups = { AddGroup.class, EditGroup.class }) private String weighbridge; /** * 销售 */ - @NotBlank(message = "销售不能为空", groups = { AddGroup.class, EditGroup.class }) private String salesPerson; /** * 负责人（司机/跟单员） */ - @NotBlank(message = "负责人（司机/跟单员）不能为空", groups = { AddGroup.class, EditGroup.class }) private String principal; /** * 负责人电话（手机号/固话） */ - @NotBlank(message = "负责人电话（手机号/固话）不能为空", groups = { AddGroup.class, EditGroup.class }) private String principalPhone; /** * 完成状态（0=待发货，1=已发货，2=已完成，3=取消） */ - @NotNull(message = "完成状态（0=待发货，1=已发货，2=已完成，3=取消）不能为空", groups = { AddGroup.class, EditGroup.class }) private Long status; /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String remark; diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryWaybillDetailBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryWaybillDetailBo.java index 881d3674..c4fb5ff0 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryWaybillDetailBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryWaybillDetailBo.java @@ -23,91 +23,76 @@ public class WmsDeliveryWaybillDetailBo extends BaseEntity { /** * 明细唯一ID */ - @NotNull(message = "明细唯一ID不能为空", groups = { EditGroup.class }) private Long detailId; /** * 关联发货单主表ID */ - @NotNull(message = "关联发货单主表ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long waybillId; /** * 关联钢卷表ID（钢卷基础信息在钢卷表中） */ - @NotNull(message = "关联钢卷表ID（钢卷基础信息在钢卷表中）不能为空", groups = { AddGroup.class, EditGroup.class }) private Long coilId; /** * 品名（如：冷硬钢卷、冷轧钢卷） */ - @NotBlank(message = "品名（如：冷硬钢卷、冷轧钢卷）不能为空", groups = { AddGroup.class, EditGroup.class }) private String productName; /** * 切边（净边/毛边） */ - @NotBlank(message = "切边（净边/毛边）不能为空", groups = { AddGroup.class, EditGroup.class }) private String edgeType; /** * 包装（裸包/简包1/精包2等） */ - @NotBlank(message = "包装（裸包/简包1/精包2等）不能为空", groups = { AddGroup.class, EditGroup.class }) private String packaging; /** * 结算方式（卷重/磅重） */ - @NotBlank(message = "结算方式（卷重/磅重）不能为空", groups = { AddGroup.class, EditGroup.class }) private String settlementType; /** * 原料厂家 */ - @NotBlank(message = "原料厂家不能为空", groups = { AddGroup.class, EditGroup.class }) private String rawMaterialFactory; /** * 卷号 */ - @NotBlank(message = "卷号不能为空", groups = { AddGroup.class, EditGroup.class }) private String coilNo; /** * 规格 */ - @NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class }) private String specification; /** * 材质 */ - @NotBlank(message = "材质不能为空", groups = { AddGroup.class, EditGroup.class }) private String material; /** * 数量（件） */ - @NotNull(message = "数量（件）不能为空", groups = { AddGroup.class, EditGroup.class }) private Long quantity; /** * 重量（kg） */ - @NotNull(message = "重量（kg）不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal weight; /** * 单价 */ - @NotNull(message = "单价不能为空", groups = { AddGroup.class, EditGroup.class }) private BigDecimal unitPrice; /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String remark; diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml index cebdcad3..ed6a8267 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml @@ -35,7 +35,7 @@ SELECT waybill_id, COUNT(*) as total_coil_count, - SUM(weight/1000.0) as total_weight + SUM(weight) as total_weight FROM wms_delivery_waybill_detail WHERE del_flag = 0 GROUP BY waybill_id