From 993f92c0de9052c4434e129f2bcb0ea26ad7894c Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Sun, 22 May 2022 22:32:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=85=A5=E5=BA=93=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wm/controller/WmItemRecptController.java | 109 +++++ .../wm/controller/WmWarehouseController.java | 9 + .../com/ktg/mes/wm/domain/WmItemRecpt.java | 377 ++++++++++++++++++ .../ktg/mes/wm/domain/WmStorageLocation.java | 42 +- .../com/ktg/mes/wm/domain/WmWarehouse.java | 42 +- .../ktg/mes/wm/mapper/WmItemRecptMapper.java | 63 +++ .../ktg/mes/wm/mapper/WmWarehouseMapper.java | 2 + .../mes/wm/service/IWmItemRecptService.java | 68 ++++ .../mes/wm/service/IWmWarehouseService.java | 2 + .../service/impl/WmItemRecptServiceImpl.java | 109 +++++ .../service/impl/WmWarehouseServiceImpl.java | 5 + .../resources/mapper/wm/WmItemRecptMapper.xml | 193 +++++++++ .../resources/mapper/wm/WmWarehouseMapper.xml | 35 +- 13 files changed, 1021 insertions(+), 35 deletions(-) create mode 100644 ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmItemRecpt.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmItemRecptMapper.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmItemRecptService.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmItemRecptServiceImpl.java create mode 100644 ktg-mes/src/main/resources/mapper/wm/WmItemRecptMapper.xml diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java new file mode 100644 index 0000000..6b324e1 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmItemRecptController.java @@ -0,0 +1,109 @@ +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.WmItemRecpt; +import com.ktg.mes.wm.service.IWmItemRecptService; +import com.ktg.common.utils.poi.ExcelUtil; +import com.ktg.common.core.page.TableDataInfo; + +/** + * 物料入库单Controller + * + * @author yinjinlu + * @date 2022-05-22 + */ +@RestController +@RequestMapping("/mes/wm/itemrecpt") +public class WmItemRecptController extends BaseController +{ + @Autowired + private IWmItemRecptService wmItemRecptService; + + /** + * 查询物料入库单列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:itemrecpt:list')") + @GetMapping("/list") + public TableDataInfo list(WmItemRecpt wmItemRecpt) + { + startPage(); + List list = wmItemRecptService.selectWmItemRecptList(wmItemRecpt); + return getDataTable(list); + } + + /** + * 导出物料入库单列表 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:itemrecpt:export')") + @Log(title = "物料入库单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, WmItemRecpt wmItemRecpt) + { + List list = wmItemRecptService.selectWmItemRecptList(wmItemRecpt); + ExcelUtil util = new ExcelUtil(WmItemRecpt.class); + util.exportExcel(response, list, "物料入库单数据"); + } + + /** + * 获取物料入库单详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:itemrecpt:query')") + @GetMapping(value = "/{recptId}") + public AjaxResult getInfo(@PathVariable("recptId") Long recptId) + { + return AjaxResult.success(wmItemRecptService.selectWmItemRecptByRecptId(recptId)); + } + + /** + * 新增物料入库单 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:itemrecpt:add')") + @Log(title = "物料入库单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody WmItemRecpt wmItemRecpt) + { + if(UserConstants.NOT_UNIQUE.equals(wmItemRecptService.checkRecptCodeUnique(wmItemRecpt))){ + return AjaxResult.error("单据编号已存在！"); + } + return toAjax(wmItemRecptService.insertWmItemRecpt(wmItemRecpt)); + } + + /** + * 修改物料入库单 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:itemrecpt:edit')") + @Log(title = "物料入库单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody WmItemRecpt wmItemRecpt) + { + return toAjax(wmItemRecptService.updateWmItemRecpt(wmItemRecpt)); + } + + /** + * 删除物料入库单 + */ + @PreAuthorize("@ss.hasPermi('mes:wm:itemrecpt:remove')") + @Log(title = "物料入库单", businessType = BusinessType.DELETE) + @DeleteMapping("/{recptIds}") + public AjaxResult remove(@PathVariable Long[] recptIds) + { + return toAjax(wmItemRecptService.deleteWmItemRecptByRecptIds(recptIds)); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java index 1c7bd71..88a8f27 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java @@ -48,6 +48,15 @@ public class WmWarehouseController extends BaseController return getDataTable(list); } + /** + * 查询树型的列表 + * @return + */ + @GetMapping("/getTreeList") + public AjaxResult getTreeList(){ + return AjaxResult.success(wmWarehouseService.getTreeList()); + } + /** * 导出仓库设置列表 */ diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmItemRecpt.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmItemRecpt.java new file mode 100644 index 0000000..20ed9be --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmItemRecpt.java @@ -0,0 +1,377 @@ +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_item_recpt + * + * @author yinjinlu + * @date 2022-05-22 + */ +public class WmItemRecpt 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 iqcId; + + /** 来料检验单编号 */ + @Excel(name = "来料检验单编号") + private String iqcCode; + + /** 采购订单编号 */ + @Excel(name = "采购订单编号") + private String poCode; + + /** 供应商ID */ + @Excel(name = "供应商ID") + private Long vendorId; + + /** 供应商编码 */ + @Excel(name = "供应商编码") + private String vendorCode; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String vendorName; + + /** 供应商简称 */ + @Excel(name = "供应商简称") + private String vendorNick; + + /** 仓库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 setIqcId(Long iqcId) + { + this.iqcId = iqcId; + } + + public Long getIqcId() + { + return iqcId; + } + public void setIqcCode(String iqcCode) + { + this.iqcCode = iqcCode; + } + + public String getIqcCode() + { + return iqcCode; + } + public void setPoCode(String poCode) + { + this.poCode = poCode; + } + + public String getPoCode() + { + return poCode; + } + public void setVendorId(Long vendorId) + { + this.vendorId = vendorId; + } + + public Long getVendorId() + { + return vendorId; + } + public void setVendorCode(String vendorCode) + { + this.vendorCode = vendorCode; + } + + public String getVendorCode() + { + return vendorCode; + } + public void setVendorName(String vendorName) + { + this.vendorName = vendorName; + } + + public String getVendorName() + { + return vendorName; + } + public void setVendorNick(String vendorNick) + { + this.vendorNick = vendorNick; + } + + public String getVendorNick() + { + return vendorNick; + } + 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("iqcId", getIqcId()) + .append("iqcCode", getIqcCode()) + .append("poCode", getPoCode()) + .append("vendorId", getVendorId()) + .append("vendorCode", getVendorCode()) + .append("vendorName", getVendorName()) + .append("vendorNick", getVendorNick()) + .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/domain/WmStorageLocation.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmStorageLocation.java index d2744f3..e6370be 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmStorageLocation.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmStorageLocation.java @@ -1,6 +1,8 @@ package com.ktg.mes.wm.domain; import java.math.BigDecimal; +import java.util.List; + import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ktg.common.annotation.Excel; @@ -51,6 +53,8 @@ public class WmStorageLocation extends BaseEntity /** 预留字段4 */ private Long attr4; + private List children; + public void setLocationId(Long locationId) { this.locationId = locationId; @@ -142,24 +146,28 @@ public class WmStorageLocation extends BaseEntity return attr4; } + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("locationId", getLocationId()) - .append("locationCode", getLocationCode()) - .append("locationName", getLocationName()) - .append("warehouseId", getWarehouseId()) - .append("area", getArea()) - .append("areaFlag", getAreaFlag()) - .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(); + return "WmStorageLocation{" + + "locationId=" + locationId + + ", locationCode='" + locationCode + '\'' + + ", locationName='" + locationName + '\'' + + ", warehouseId=" + warehouseId + + ", area=" + area + + ", areaFlag='" + areaFlag + '\'' + + ", attr1='" + attr1 + '\'' + + ", attr2='" + attr2 + '\'' + + ", attr3=" + attr3 + + ", attr4=" + attr4 + + ", children=" + children + + '}'; } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmWarehouse.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmWarehouse.java index fd03b97..3a1d875 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmWarehouse.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmWarehouse.java @@ -1,6 +1,8 @@ package com.ktg.mes.wm.domain; import java.math.BigDecimal; +import java.util.List; + import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ktg.common.annotation.Excel; @@ -51,6 +53,8 @@ public class WmWarehouse extends BaseEntity /** 预留字段4 */ private Long attr4; + private List children; + public void setWarehouseId(Long warehouseId) { this.warehouseId = warehouseId; @@ -142,24 +146,28 @@ public class WmWarehouse extends BaseEntity return attr4; } + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("warehouseId", getWarehouseId()) - .append("warehouseCode", getWarehouseCode()) - .append("warehouseName", getWarehouseName()) - .append("location", getLocation()) - .append("area", getArea()) - .append("charge", getCharge()) - .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(); + return "WmWarehouse{" + + "warehouseId=" + warehouseId + + ", warehouseCode='" + warehouseCode + '\'' + + ", warehouseName='" + warehouseName + '\'' + + ", location='" + location + '\'' + + ", area=" + area + + ", charge='" + charge + '\'' + + ", attr1='" + attr1 + '\'' + + ", attr2='" + attr2 + '\'' + + ", attr3=" + attr3 + + ", attr4=" + attr4 + + ", children=" + children + + '}'; } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmItemRecptMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmItemRecptMapper.java new file mode 100644 index 0000000..e5a8029 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmItemRecptMapper.java @@ -0,0 +1,63 @@ +package com.ktg.mes.wm.mapper; + +import java.util.List; +import com.ktg.mes.wm.domain.WmItemRecpt; + +/** + * 物料入库单Mapper接口 + * + * @author yinjinlu + * @date 2022-05-22 + */ +public interface WmItemRecptMapper +{ + /** + * 查询物料入库单 + * + * @param recptId 物料入库单主键 + * @return 物料入库单 + */ + public WmItemRecpt selectWmItemRecptByRecptId(Long recptId); + + /** + * 查询物料入库单列表 + * + * @param wmItemRecpt 物料入库单 + * @return 物料入库单集合 + */ + public List selectWmItemRecptList(WmItemRecpt wmItemRecpt); + + public WmItemRecpt checkRecptCodeUnique(WmItemRecpt wmItemRecpt); + + /** + * 新增物料入库单 + * + * @param wmItemRecpt 物料入库单 + * @return 结果 + */ + public int insertWmItemRecpt(WmItemRecpt wmItemRecpt); + + /** + * 修改物料入库单 + * + * @param wmItemRecpt 物料入库单 + * @return 结果 + */ + public int updateWmItemRecpt(WmItemRecpt wmItemRecpt); + + /** + * 删除物料入库单 + * + * @param recptId 物料入库单主键 + * @return 结果 + */ + public int deleteWmItemRecptByRecptId(Long recptId); + + /** + * 批量删除物料入库单 + * + * @param recptIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWmItemRecptByRecptIds(Long[] recptIds); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java index 69c6f82..c4d29f7 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java @@ -27,6 +27,8 @@ public interface WmWarehouseMapper */ public List selectWmWarehouseList(WmWarehouse wmWarehouse); + public List getTreeList(); + public WmWarehouse checkWarehouseCodeUnique(WmWarehouse wmWarehouse); public WmWarehouse checkWarehouseNameUnique(WmWarehouse wmWarehouse); diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmItemRecptService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmItemRecptService.java new file mode 100644 index 0000000..970ef66 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmItemRecptService.java @@ -0,0 +1,68 @@ +package com.ktg.mes.wm.service; + +import java.util.List; +import com.ktg.mes.wm.domain.WmItemRecpt; + +/** + * 物料入库单Service接口 + * + * @author yinjinlu + * @date 2022-05-22 + */ +public interface IWmItemRecptService +{ + /** + * 查询物料入库单 + * + * @param recptId 物料入库单主键 + * @return 物料入库单 + */ + public WmItemRecpt selectWmItemRecptByRecptId(Long recptId); + + /** + * 查询物料入库单列表 + * + * @param wmItemRecpt 物料入库单 + * @return 物料入库单集合 + */ + public List selectWmItemRecptList(WmItemRecpt wmItemRecpt); + + /** + * 检查入库单号是否重复 + * @param wmItemRecpt + * @return + */ + public String checkRecptCodeUnique(WmItemRecpt wmItemRecpt); + + /** + * 新增物料入库单 + * + * @param wmItemRecpt 物料入库单 + * @return 结果 + */ + public int insertWmItemRecpt(WmItemRecpt wmItemRecpt); + + /** + * 修改物料入库单 + * + * @param wmItemRecpt 物料入库单 + * @return 结果 + */ + public int updateWmItemRecpt(WmItemRecpt wmItemRecpt); + + /** + * 批量删除物料入库单 + * + * @param recptIds 需要删除的物料入库单主键集合 + * @return 结果 + */ + public int deleteWmItemRecptByRecptIds(Long[] recptIds); + + /** + * 删除物料入库单信息 + * + * @param recptId 物料入库单主键 + * @return 结果 + */ + public int deleteWmItemRecptByRecptId(Long recptId); +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java index e85f8f1..f416de2 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java @@ -27,6 +27,8 @@ public interface IWmWarehouseService */ public List selectWmWarehouseList(WmWarehouse wmWarehouse); + public List getTreeList(); + /** * 检查仓库编码是否重复 * @param wmWarehouse diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmItemRecptServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmItemRecptServiceImpl.java new file mode 100644 index 0000000..f43fa5d --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmItemRecptServiceImpl.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.WmItemRecptMapper; +import com.ktg.mes.wm.domain.WmItemRecpt; +import com.ktg.mes.wm.service.IWmItemRecptService; + +/** + * 物料入库单Service业务层处理 + * + * @author yinjinlu + * @date 2022-05-22 + */ +@Service +public class WmItemRecptServiceImpl implements IWmItemRecptService +{ + @Autowired + private WmItemRecptMapper wmItemRecptMapper; + + /** + * 查询物料入库单 + * + * @param recptId 物料入库单主键 + * @return 物料入库单 + */ + @Override + public WmItemRecpt selectWmItemRecptByRecptId(Long recptId) + { + return wmItemRecptMapper.selectWmItemRecptByRecptId(recptId); + } + + /** + * 查询物料入库单列表 + * + * @param wmItemRecpt 物料入库单 + * @return 物料入库单 + */ + @Override + public List selectWmItemRecptList(WmItemRecpt wmItemRecpt) + { + return wmItemRecptMapper.selectWmItemRecptList(wmItemRecpt); + } + + @Override + public String checkRecptCodeUnique(WmItemRecpt wmItemRecpt) { + WmItemRecpt itemRecpt = wmItemRecptMapper.checkRecptCodeUnique(wmItemRecpt); + Long recptId = wmItemRecpt.getRecptId()==null?-1L:wmItemRecpt.getRecptId(); + if(StringUtils.isNotNull(itemRecpt) && itemRecpt.getRecptId().longValue() != recptId.longValue()){ + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 新增物料入库单 + * + * @param wmItemRecpt 物料入库单 + * @return 结果 + */ + @Override + public int insertWmItemRecpt(WmItemRecpt wmItemRecpt) + { + wmItemRecpt.setCreateTime(DateUtils.getNowDate()); + return wmItemRecptMapper.insertWmItemRecpt(wmItemRecpt); + } + + /** + * 修改物料入库单 + * + * @param wmItemRecpt 物料入库单 + * @return 结果 + */ + @Override + public int updateWmItemRecpt(WmItemRecpt wmItemRecpt) + { + wmItemRecpt.setUpdateTime(DateUtils.getNowDate()); + return wmItemRecptMapper.updateWmItemRecpt(wmItemRecpt); + } + + /** + * 批量删除物料入库单 + * + * @param recptIds 需要删除的物料入库单主键 + * @return 结果 + */ + @Override + public int deleteWmItemRecptByRecptIds(Long[] recptIds) + { + return wmItemRecptMapper.deleteWmItemRecptByRecptIds(recptIds); + } + + /** + * 删除物料入库单信息 + * + * @param recptId 物料入库单主键 + * @return 结果 + */ + @Override + public int deleteWmItemRecptByRecptId(Long recptId) + { + return wmItemRecptMapper.deleteWmItemRecptByRecptId(recptId); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java index 3e8a31e..d5c32fc 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java @@ -48,6 +48,11 @@ public class WmWarehouseServiceImpl implements IWmWarehouseService return wmWarehouseMapper.selectWmWarehouseList(wmWarehouse); } + @Override + public List getTreeList() { + return wmWarehouseMapper.getTreeList(); + } + @Override public String checkWarehouseCodeUnique(WmWarehouse wmWarehouse) { WmWarehouse warehouse = wmWarehouseMapper.checkWarehouseCodeUnique(wmWarehouse); diff --git a/ktg-mes/src/main/resources/mapper/wm/WmItemRecptMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmItemRecptMapper.xml new file mode 100644 index 0000000..7273e8e --- /dev/null +++ b/ktg-mes/src/main/resources/mapper/wm/WmItemRecptMapper.xml @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select recpt_id, recpt_code, recpt_name, iqc_id, iqc_code, po_code, vendor_id, vendor_code, vendor_name, vendor_nick, 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_item_recpt + + + + + + + + + + + insert into wm_item_recpt + + recpt_code, + recpt_name, + iqc_id, + iqc_code, + po_code, + vendor_id, + vendor_code, + vendor_name, + vendor_nick, + 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}, + #{iqcId}, + #{iqcCode}, + #{poCode}, + #{vendorId}, + #{vendorCode}, + #{vendorName}, + #{vendorNick}, + #{warehouseId}, + #{warehouseCode}, + #{warehouseName}, + #{locationId}, + #{locationCode}, + #{locationName}, + #{areaId}, + #{areaCode}, + #{areaName}, + #{recptDate}, + #{status}, + #{remark}, + #{attr1}, + #{attr2}, + #{attr3}, + #{attr4}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update wm_item_recpt + + recpt_code = #{recptCode}, + recpt_name = #{recptName}, + iqc_id = #{iqcId}, + iqc_code = #{iqcCode}, + po_code = #{poCode}, + vendor_id = #{vendorId}, + vendor_code = #{vendorCode}, + vendor_name = #{vendorName}, + vendor_nick = #{vendorNick}, + 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_item_recpt where recpt_id = #{recptId} + + + + delete from wm_item_recpt where recpt_id in + + #{recptId} + + + \ No newline at end of file diff --git a/ktg-mes/src/main/resources/mapper/wm/WmWarehouseMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmWarehouseMapper.xml index 11ac894..ec5c124 100644 --- a/ktg-mes/src/main/resources/mapper/wm/WmWarehouseMapper.xml +++ b/ktg-mes/src/main/resources/mapper/wm/WmWarehouseMapper.xml @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -20,8 +20,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + select warehouse_id, warehouse_code, warehouse_name, location, area, charge, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_warehouse @@ -36,6 +60,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and charge = #{charge} + +