diff --git a/klp-ui/src/views/wms/receive/plan/index.vue b/klp-ui/src/views/wms/receive/plan/index.vue new file mode 100644 index 00000000..fe791db8 --- /dev/null +++ b/klp-ui/src/views/wms/receive/plan/index.vue @@ -0,0 +1,364 @@ + + + + + + + + + + + + 搜索 + 重置 + + + + + + 新增 + + + 修改 + + + 删除 + + + 导出 + + + + + + + + + + {{ row.planName }} + + + + 计划日期: + {{ parseTime(row.planDate, '{y}-{m}-{d}') }} + + + 备注: + {{ row.remark || '-' }} + + + 创建人: + {{ row.createBy }} + + + 更新时间: + {{ parseTime(row.updateTime, '{y}-{m}-{d}') }} + + + + 修改 + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-wms/src/main/java/com/klp/domain/WmsDeliveryPlan.java b/klp-wms/src/main/java/com/klp/domain/WmsDeliveryPlan.java index 7d854a3a..008c619e 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsDeliveryPlan.java +++ b/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; /** * 备注 */ diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java index 25c837dc..23641677 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java +++ b/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; /** * 备注 diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanVo.java index 63c35993..6b49ddd0 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanVo.java +++ b/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; + /** * 备注 */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java index 9ee55c3e..c8fcfc27 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java @@ -65,6 +65,7 @@ public class WmsDeliveryPlanServiceImpl implements IWmsDeliveryPlanService { LambdaQueryWrapper 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; } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml index bd7eadef..4e9b23e8 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml @@ -8,6 +8,7 @@ +