Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

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;
 
 

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;
 
 

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