Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java

@@ -45,6 +45,10 @@ public class WmsPurchasePlanDetail extends BaseEntity {
      * 单位
      */
     private String unit;
+    /**
+     * 状态（ 0=新建，1=在途，2=到货，3=待审核，4=采购完成）
+     */
+    private Integer status;
     /**
      * 备注
      */

klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanBo.java

@@ -27,25 +27,21 @@ public class WmsPurchasePlanBo extends BaseEntity {
     /**
      * 采购计划编号
      */
-    @NotBlank(message = "采购计划编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String planCode;
 
     /**
      * 负责人
      */
-    @NotBlank(message = "负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String owner;
 
     /**
      * 关联订单ID
      */
-    @NotNull(message = "关联订单ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long orderId;
 
     /**
      * 状态（0=新建，1=待审核，2=已审核，3=已完成，4=已取消）
      */
-    @NotNull(message = "状态（0=新建，1=待审核，2=已审核，3=已完成，4=已取消）不能为空", groups = { AddGroup.class, EditGroup.class })
     private Integer status;
 
     /**

klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java

@@ -28,33 +28,33 @@ public class WmsPurchasePlanDetailBo extends BaseEntity {
     /**
      * 采购计划ID
      */
-    @NotNull(message = "采购计划ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long planId;
 
     /**
      * 原材料ID
      */
-    @NotNull(message = "原材料ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long rawMaterialId;
 
     /**
      * 负责人
      */
-    @NotBlank(message = "负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String owner;
 
     /**
      * 计划采购数量
      */
-    @NotNull(message = "计划采购数量不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal quantity;
 
     /**
      * 单位
      */
-    @NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String unit;
 
+    /**
+     * 状态（ 0=新建，1=在途，2=到货，3=待审核，4=采购完成）
+     */
+    private Integer status;
+
     /**
      * 备注
      */

klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java

@@ -56,6 +56,12 @@ public class WmsPurchasePlanDetailVo {
     @ExcelProperty(value = "单位")
     private String unit;
 
+    /**
+     * 状态（ 0=新建，1=在途，2=到货，3=待审核，4=采购完成）
+     */
+    @ExcelProperty(value = "状态")
+    private Integer status;
+
     /**
      * 备注
      */

klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="owner" column="owner"/>
         <result property="quantity" column="quantity"/>
         <result property="unit" column="unit"/>
+        <result property="status" column="status"/>
         <result property="remark" column="remark"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createTime" column="create_time"/>