diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java index b0639b38..c0e89a23 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java @@ -56,6 +56,19 @@ public class WmsMaterialCoilController extends BaseController { ExcelUtil.exportExcel(list, "钢卷物料表", WmsMaterialCoilExportVo.class, response); } + /** + * 删除钢卷物料表 + * + * @param coilId 主键 + */ + @Log(title = "钢卷物料表", businessType = BusinessType.DELETE) + @DeleteMapping("/exportCoil/{coilId}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("coilId") Long coilId) { + + return toAjax(iWmsMaterialCoilService.exportCoil(coilId)); + } + /** * 获取钢卷物料表详细信息 * diff --git a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java index c08c3742..c94eb46b 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java @@ -1,11 +1,14 @@ package com.klp.domain; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; +import java.util.Date; /** * 钢卷物料表对象 wms_material_coil @@ -121,5 +124,9 @@ public class WmsMaterialCoil extends BaseEntity { * 包装要求 */ private String packagingRequirement; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ExcelProperty(value = "发货时间") + private Date exportTime; } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java index 1f1cec1b..bf07be34 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java @@ -1,5 +1,6 @@ package com.klp.domain.bo; +import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; import com.klp.common.core.domain.BaseEntity; import com.klp.common.core.validate.AddGroup; @@ -122,6 +123,10 @@ public class WmsMaterialCoilBo extends BaseEntity { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date exportTime; + private String itemIds; private Long actualWarehouseId; diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java index fc12f294..5c8bbf1a 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java @@ -2,11 +2,13 @@ package com.klp.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import com.klp.common.annotation.ExcelDictFormat; import com.klp.common.convert.ExcelDictConvert; import com.klp.common.core.domain.BaseEntity; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; import java.util.List; @@ -283,6 +285,11 @@ public class WmsMaterialCoilVo extends BaseEntity { */ private BigDecimal productWidth; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ExcelProperty(value = "发货时间") + private Date exportTime; + /** * 产品BOM ID(联查字段) */ diff --git a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java index 05cb1d75..43c8b9b9 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java @@ -5,6 +5,7 @@ import com.klp.domain.bo.WmsMaterialCoilBo; import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; +import javax.validation.constraints.NotEmpty; import java.util.Collection; import java.util.List; import java.util.Map; @@ -96,5 +97,7 @@ public interface IWmsMaterialCoilService { * @return 导出数据列表 */ List queryExportList(WmsMaterialCoilBo bo); + + int exportCoil(@NotEmpty(message = "主键不能为空") Long coilId); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index d9475de6..12e30dd9 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -1589,6 +1589,20 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { return baseMapper.selectExportList(lqw); } + /** + * 钢卷发货 + * @param coilId + * @return + */ + @Override + public int exportCoil(Long coilId) { + WmsMaterialCoilVo wmsMaterialCoilVo = queryById(coilId); + wmsMaterialCoilVo.setExportTime(new Date()); + wmsMaterialCoilVo.setStatus(1); + + return baseMapper.updateById(BeanUtil.toBean(wmsMaterialCoilVo,WmsMaterialCoil.class)); + } + /** * 构建查询条件 */