diff --git a/doc/设计文档/数据库设计/mes-wm.sql b/doc/设计文档/数据库设计/mes-wm.sql index e8da857..eeb896f 100644 --- a/doc/设计文档/数据库设计/mes-wm.sql +++ b/doc/设计文档/数据库设计/mes-wm.sql @@ -655,8 +655,8 @@ create table wm_product_recpt ( -- ---------------------------- -- 13、产品入库记录表行表 -- ---------------------------- -drop table if exists wm_product_produce_line; -create table wm_product_produce_line ( +drop table if exists wm_product_recpt_line; +create table wm_product_recpt_line ( line_id bigint(20) not null auto_increment comment '行ID', recpt_id bigint(20) comment '入库记录ID', material_stock_id bigint(20) comment '库存记录ID', diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptController.java new file mode 100644 index 0000000..98c96a2 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmProductRecptController.java @@ -0,0 +1,112 @@ +package com.ktg.mes.wm.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.ktg.common.constant.UserConstants; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ktg.common.annotation.Log; +import com.ktg.common.core.controller.BaseController; +import com.ktg.common.core.domain.AjaxResult; +import com.ktg.common.enums.BusinessType; +import com.ktg.mes.wm.domain.WmProductRecpt; +import com.ktg.mes.wm.service.IWmProductRecptService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 产品入库录Controller + * + * @author yinjinlu + * @date 2022-09-22 + */ +@RestController +@RequestMapping("/mes/wm/productrecpt") +public class WmProductRecptController extends BaseController +{ + @Autowired + private IWmProductRecptService wmProductRecptService; + + /** + * 查询产品入库录列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productrecpt:list')") + @GetMapping("/list") + public TableDataInfo list(WmProductRecpt wmProductRecpt) + { + startPage(); + List list = wmProductRecptService.selectWmProductRecptList(wmProductRecpt); + return getDataTable(list); + } + + /** + * 导出产品入库录列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productrecpt:export')") + @Log(title = "产品入库录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmProductRecpt wmProductRecpt) + { + List list = wmProductRecptService.selectWmProductRecptList(wmProductRecpt); + ExcelUtil util = new ExcelUtil(WmProductRecpt.class); + util.exportExcel(response, list, "产品入库录数据"); + } + + /** + * 获取产品入库录详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productrecpt:query')") + @GetMapping(value = "/{recptId}") + public AjaxResult getInfo(@PathVariable("recptId") Long recptId) + { + return AjaxResult.success(wmProductRecptService.selectWmProductRecptByRecptId(recptId)); + } + + /** + * 新增产品入库录 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productrecpt:add')") + @Log(title = "产品入库录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmProductRecpt wmProductRecpt) + { + if(UserConstants.NOT_UNIQUE.equals(wmProductRecptService.checkUnique(wmProductRecpt))){ + return AjaxResult.error("入库单编号已存在!"); + } + return toAjax(wmProductRecptService.insertWmProductRecpt(wmProductRecpt)); + } + + /** + * 修改产品入库录 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productrecpt:edit')") + @Log(title = "产品入库录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmProductRecpt wmProductRecpt) + { + if(UserConstants.NOT_UNIQUE.equals(wmProductRecptService.checkUnique(wmProductRecpt))){ + return AjaxResult.error("入库单编号已存在!"); + } + return toAjax(wmProductRecptService.updateWmProductRecpt(wmProductRecpt)); + } + + /** + * 删除产品入库录 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:productrecpt:remove')") + @Log(title = "产品入库录", businessType = BusinessType.DELETE) + @DeleteMapping("/{recptIds}") + public AjaxResult remove(@PathVariable Long[] recptIds) + { + return toAjax(wmProductRecptService.deleteWmProductRecptByRecptIds(recptIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecpt.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecpt.java new file mode 100644 index 0000000..d694ff1 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecpt.java @@ -0,0 +1,321 @@ +package com.ktg.mes.wm.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ktg.common.annotation.Excel; +import com.ktg.common.core.domain.BaseEntity; + +/** + * 产品入库录对象 wm_product_recpt + * + * @author yinjinlu + * @date 2022-09-22 + */ +public class WmProductRecpt extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 入库单ID */ + private Long recptId; + + /** 入库单编号 */ + @Excel(name = "入库单编号") + private String recptCode; + + /** 入库单名称 */ + @Excel(name = "入库单名称") + private String recptName; + + /** 生产工单ID */ + @Excel(name = "生产工单ID") + private Long workorderId; + + /** 生产工单编码 */ + @Excel(name = "生产工单编码") + private String workorderCode; + + /** 生产工单名称 */ + @Excel(name = "生产工单名称") + private String workorderName; + + /** 仓库ID */ + @Excel(name = "仓库ID") + private Long warehouseId; + + /** 仓库编码 */ + @Excel(name = "仓库编码") + private String warehouseCode; + + /** 仓库名称 */ + @Excel(name = "仓库名称") + private String warehouseName; + + /** 库区ID */ + @Excel(name = "库区ID") + private Long locationId; + + /** 库区编码 */ + @Excel(name = "库区编码") + private String locationCode; + + /** 库区名称 */ + @Excel(name = "库区名称") + private String locationName; + + /** 库位ID */ + @Excel(name = "库位ID") + private Long areaId; + + /** 库位编码 */ + @Excel(name = "库位编码") + private String areaCode; + + /** 库位名称 */ + @Excel(name = "库位名称") + private String areaName; + + /** 入库日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date recptDate; + + /** 单据状态 */ + @Excel(name = "单据状态") + private String status; + + /** 预留字段1 */ + private String attr1; + + /** 预留字段2 */ + private String attr2; + + /** 预留字段3 */ + private Long attr3; + + /** 预留字段4 */ + private Long attr4; + + public void setRecptId(Long recptId) + { + this.recptId = recptId; + } + + public Long getRecptId() + { + return recptId; + } + public void setRecptCode(String recptCode) + { + this.recptCode = recptCode; + } + + public String getRecptCode() + { + return recptCode; + } + public void setRecptName(String recptName) + { + this.recptName = recptName; + } + + public String getRecptName() + { + return recptName; + } + public void setWorkorderId(Long workorderId) + { + this.workorderId = workorderId; + } + + public Long getWorkorderId() + { + return workorderId; + } + public void setWorkorderCode(String workorderCode) + { + this.workorderCode = workorderCode; + } + + public String getWorkorderCode() + { + return workorderCode; + } + public void setWorkorderName(String workorderName) + { + this.workorderName = workorderName; + } + + public String getWorkorderName() + { + return workorderName; + } + public void setWarehouseId(Long warehouseId) + { + this.warehouseId = warehouseId; + } + + public Long getWarehouseId() + { + return warehouseId; + } + public void setWarehouseCode(String warehouseCode) + { + this.warehouseCode = warehouseCode; + } + + public String getWarehouseCode() + { + return warehouseCode; + } + public void setWarehouseName(String warehouseName) + { + this.warehouseName = warehouseName; + } + + public String getWarehouseName() + { + return warehouseName; + } + public void setLocationId(Long locationId) + { + this.locationId = locationId; + } + + public Long getLocationId() + { + return locationId; + } + public void setLocationCode(String locationCode) + { + this.locationCode = locationCode; + } + + public String getLocationCode() + { + return locationCode; + } + public void setLocationName(String locationName) + { + this.locationName = locationName; + } + + public String getLocationName() + { + return locationName; + } + public void setAreaId(Long areaId) + { + this.areaId = areaId; + } + + public Long getAreaId() + { + return areaId; + } + public void setAreaCode(String areaCode) + { + this.areaCode = areaCode; + } + + public String getAreaCode() + { + return areaCode; + } + public void setAreaName(String areaName) + { + this.areaName = areaName; + } + + public String getAreaName() + { + return areaName; + } + public void setRecptDate(Date recptDate) + { + this.recptDate = recptDate; + } + + public Date getRecptDate() + { + return recptDate; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + public void setAttr2(String attr2) + { + this.attr2 = attr2; + } + + public String getAttr2() + { + return attr2; + } + public void setAttr3(Long attr3) + { + this.attr3 = attr3; + } + + public Long getAttr3() + { + return attr3; + } + public void setAttr4(Long attr4) + { + this.attr4 = attr4; + } + + public Long getAttr4() + { + return attr4; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("recptId", getRecptId()) + .append("recptCode", getRecptCode()) + .append("recptName", getRecptName()) + .append("workorderId", getWorkorderId()) + .append("workorderCode", getWorkorderCode()) + .append("workorderName", getWorkorderName()) + .append("warehouseId", getWarehouseId()) + .append("warehouseCode", getWarehouseCode()) + .append("warehouseName", getWarehouseName()) + .append("locationId", getLocationId()) + .append("locationCode", getLocationCode()) + .append("locationName", getLocationName()) + .append("areaId", getAreaId()) + .append("areaCode", getAreaCode()) + .append("areaName", getAreaName()) + .append("recptDate", getRecptDate()) + .append("status", getStatus()) + .append("remark", getRemark()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductRecptMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductRecptMapper.java new file mode 100644 index 0000000..d2c71f0 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmProductRecptMapper.java @@ -0,0 +1,68 @@ +package com.ktg.mes.wm.mapper; + +import java.util.List; +import com.ktg.mes.wm.domain.WmProductRecpt; + +/** + * 产品入库录Mapper接口 + * + * @author yinjinlu + * @date 2022-09-22 + */ +public interface WmProductRecptMapper +{ + /** + * 查询产品入库录 + * + * @param recptId 产品入库录主键 + * @return 产品入库录 + */ + public WmProductRecpt selectWmProductRecptByRecptId(Long recptId); + + /** + * 查询产品入库录列表 + * + * @param wmProductRecpt 产品入库录 + * @return 产品入库录集合 + */ + public List selectWmProductRecptList(WmProductRecpt wmProductRecpt); + + /** + * 检查编码唯一性 + * @param wmProductRecpt + * @return + */ + public WmProductRecpt checkUnique(WmProductRecpt wmProductRecpt); + + /** + * 新增产品入库录 + * + * @param wmProductRecpt 产品入库录 + * @return 结果 + */ + public int insertWmProductRecpt(WmProductRecpt wmProductRecpt); + + /** + * 修改产品入库录 + * + * @param wmProductRecpt 产品入库录 + * @return 结果 + */ + public int updateWmProductRecpt(WmProductRecpt wmProductRecpt); + + /** + * 删除产品入库录 + * + * @param recptId 产品入库录主键 + * @return 结果 + */ + public int deleteWmProductRecptByRecptId(Long recptId); + + /** + * 批量删除产品入库录 + * + * @param recptIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmProductRecptByRecptIds(Long[] recptIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductRecptService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductRecptService.java new file mode 100644 index 0000000..bbf7be2 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmProductRecptService.java @@ -0,0 +1,69 @@ +package com.ktg.mes.wm.service; + +import java.util.List; +import com.ktg.mes.wm.domain.WmProductRecpt; + +/** + * 产品入库录Service接口 + * + * @author yinjinlu + * @date 2022-09-22 + */ +public interface IWmProductRecptService +{ + /** + * 查询产品入库录 + * + * @param recptId 产品入库录主键 + * @return 产品入库录 + */ + public WmProductRecpt selectWmProductRecptByRecptId(Long recptId); + + /** + * 查询产品入库录列表 + * + * @param wmProductRecpt 产品入库录 + * @return 产品入库录集合 + */ + public List selectWmProductRecptList(WmProductRecpt wmProductRecpt); + + + /** + * 检查编码唯一性 + * @param wmProductRecpt + * @return + */ + public String checkUnique(WmProductRecpt wmProductRecpt); + + /** + * 新增产品入库录 + * + * @param wmProductRecpt 产品入库录 + * @return 结果 + */ + public int insertWmProductRecpt(WmProductRecpt wmProductRecpt); + + /** + * 修改产品入库录 + * + * @param wmProductRecpt 产品入库录 + * @return 结果 + */ + public int updateWmProductRecpt(WmProductRecpt wmProductRecpt); + + /** + * 批量删除产品入库录 + * + * @param recptIds 需要删除的产品入库录主键集合 + * @return 结果 + */ + public int deleteWmProductRecptByRecptIds(Long[] recptIds); + + /** + * 删除产品入库录信息 + * + * @param recptId 产品入库录主键 + * @return 结果 + */ + public int deleteWmProductRecptByRecptId(Long recptId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductRecptServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductRecptServiceImpl.java new file mode 100644 index 0000000..94c1713 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmProductRecptServiceImpl.java @@ -0,0 +1,109 @@ +package com.ktg.mes.wm.service.impl; + +import java.util.List; + +import com.ktg.common.constant.UserConstants; +import com.ktg.common.utils.DateUtils; +import com.ktg.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ktg.mes.wm.mapper.WmProductRecptMapper; +import com.ktg.mes.wm.domain.WmProductRecpt; +import com.ktg.mes.wm.service.IWmProductRecptService; + +/** + * 产品入库录Service业务层处理 + * + * @author yinjinlu + * @date 2022-09-22 + */ +@Service +public class WmProductRecptServiceImpl implements IWmProductRecptService +{ + @Autowired + private WmProductRecptMapper wmProductRecptMapper; + + /** + * 查询产品入库录 + * + * @param recptId 产品入库录主键 + * @return 产品入库录 + */ + @Override + public WmProductRecpt selectWmProductRecptByRecptId(Long recptId) + { + return wmProductRecptMapper.selectWmProductRecptByRecptId(recptId); + } + + /** + * 查询产品入库录列表 + * + * @param wmProductRecpt 产品入库录 + * @return 产品入库录 + */ + @Override + public List selectWmProductRecptList(WmProductRecpt wmProductRecpt) + { + return wmProductRecptMapper.selectWmProductRecptList(wmProductRecpt); + } + + @Override + public String checkUnique(WmProductRecpt wmProductRecpt) { + WmProductRecpt recpt = wmProductRecptMapper.checkUnique(wmProductRecpt); + Long recptId = wmProductRecpt.getRecptId() ==null? -1L:wmProductRecpt.getRecptId(); + if(StringUtils.isNotNull(recpt) && recpt.getRecptId().longValue() != recptId.longValue()){ + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 新增产品入库录 + * + * @param wmProductRecpt 产品入库录 + * @return 结果 + */ + @Override + public int insertWmProductRecpt(WmProductRecpt wmProductRecpt) + { + wmProductRecpt.setCreateTime(DateUtils.getNowDate()); + return wmProductRecptMapper.insertWmProductRecpt(wmProductRecpt); + } + + /** + * 修改产品入库录 + * + * @param wmProductRecpt 产品入库录 + * @return 结果 + */ + @Override + public int updateWmProductRecpt(WmProductRecpt wmProductRecpt) + { + wmProductRecpt.setUpdateTime(DateUtils.getNowDate()); + return wmProductRecptMapper.updateWmProductRecpt(wmProductRecpt); + } + + /** + * 批量删除产品入库录 + * + * @param recptIds 需要删除的产品入库录主键 + * @return 结果 + */ + @Override + public int deleteWmProductRecptByRecptIds(Long[] recptIds) + { + return wmProductRecptMapper.deleteWmProductRecptByRecptIds(recptIds); + } + + /** + * 删除产品入库录信息 + * + * @param recptId 产品入库录主键 + * @return 结果 + */ + @Override + public int deleteWmProductRecptByRecptId(Long recptId) + { + return wmProductRecptMapper.deleteWmProductRecptByRecptId(recptId); + } +} diff --git a/ktg-mes/src/main/resources/mapper/wm/WmProductRecptMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmProductRecptMapper.xml new file mode 100644 index 0000000..37a67a1 --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/wm/WmProductRecptMapper.xml @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select recpt_id, recpt_code, recpt_name, workorder_id, workorder_code, workorder_name, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, recpt_date, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_recpt + + + + + + + + + + insert into wm_product_recpt + + recpt_code, + recpt_name, + workorder_id, + workorder_code, + workorder_name, + warehouse_id, + warehouse_code, + warehouse_name, + location_id, + location_code, + location_name, + area_id, + area_code, + area_name, + recpt_date, + status, + remark, + attr1, + attr2, + attr3, + attr4, + create_by, + create_time, + update_by, + update_time, + + + #{recptCode}, + #{recptName}, + #{workorderId}, + #{workorderCode}, + #{workorderName}, + #{warehouseId}, + #{warehouseCode}, + #{warehouseName}, + #{locationId}, + #{locationCode}, + #{locationName}, + #{areaId}, + #{areaCode}, + #{areaName}, + #{recptDate}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update wm_product_recpt + + recpt_code = #{recptCode}, + recpt_name = #{recptName}, + workorder_id = #{workorderId}, + workorder_code = #{workorderCode}, + workorder_name = #{workorderName}, + warehouse_id = #{warehouseId}, + warehouse_code = #{warehouseCode}, + warehouse_name = #{warehouseName}, + location_id = #{locationId}, + location_code = #{locationCode}, + location_name = #{locationName}, + area_id = #{areaId}, + area_code = #{areaCode}, + area_name = #{areaName}, + recpt_date = #{recptDate}, + status = #{status}, + remark = #{remark}, + attr1 = #{attr1}, + attr2 = #{attr2}, + attr3 = #{attr3}, + attr4 = #{attr4}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where recpt_id = #{recptId} + + + + delete from wm_product_recpt where recpt_id = #{recptId} + + + + delete from wm_product_recpt where recpt_id in + + #{recptId} + + + \ No newline at end of file