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

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

@@ -34,6 +34,10 @@ public class WmsDeliveryPlan extends BaseEntity {
      * 计划日期
      */
     private Date planDate;
+    /**
+     * 计划类型： 发货0，收货1
+     */
+    private Integer planType;
     /**
      * 备注
      */

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

@@ -28,6 +28,7 @@ public class WmsCoilPendingActionBo extends BaseEntity {
     /**
      * 关联的钢卷ID
      */
+    // 对于入库操作，这个时候还不存在钢卷，因此无法关联钢卷ID，因此先关联为0，如果id为0则跟未关联是相同的
     @NotNull(message = "关联的钢卷ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long coilId;
 

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

@@ -33,6 +33,10 @@ public class WmsDeliveryPlanBo extends BaseEntity {
      * 计划日期
      */
     private Date planDate;
+    /**
+     * 计划类型
+     */
+    private Integer planType;
 
     /**
      * 备注

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

@@ -43,6 +43,12 @@ public class WmsDeliveryPlanVo extends BaseEntity {
     @ExcelProperty(value = "计划日期")
     private Date planDate;
 
+    /**
+     * 计划类型
+     */
+    @ExcelProperty(value = "计划类型")
+    private Integer planType;
+
     /**
      * 备注
      */

klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java

@@ -65,6 +65,7 @@ public class WmsDeliveryPlanServiceImpl implements IWmsDeliveryPlanService {
         LambdaQueryWrapper<WmsDeliveryPlan> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getPlanName()), WmsDeliveryPlan::getPlanName, bo.getPlanName());
         lqw.eq(bo.getPlanDate() != null, WmsDeliveryPlan::getPlanDate, bo.getPlanDate());
+        lqw.eq(bo.getPlanType() != null, WmsDeliveryPlan::getPlanType, bo.getPlanType());
         return lqw;
     }