物料入库单

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<WmItemRecpt> 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<WmItemRecpt> list = wmItemRecptService.selectWmItemRecptList(wmItemRecpt);
+        ExcelUtil<WmItemRecpt> util = new ExcelUtil<WmItemRecpt>(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));
+    }
+}

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());
+    }
+
     /**
      * 导出仓库设置列表
      */

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();
+    }
+}

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<WmStorageArea> children;
+
     public void setLocationId(Long locationId) 
     {
         this.locationId = locationId;
@@ -142,24 +146,28 @@ public class WmStorageLocation extends BaseEntity
         return attr4;
     }
 
+    public List<WmStorageArea> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<WmStorageArea> children) {
+        this.children = children;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return "WmStorageLocation{" +
-            .append("locationId", getLocationId())
+                "locationId=" + locationId +
-            .append("locationCode", getLocationCode())
+                ", locationCode='" + locationCode + '\'' +
-            .append("locationName", getLocationName())
+                ", locationName='" + locationName + '\'' +
-            .append("warehouseId", getWarehouseId())
+                ", warehouseId=" + warehouseId +
-            .append("area", getArea())
+                ", area=" + area +
-            .append("areaFlag", getAreaFlag())
+                ", areaFlag='" + areaFlag + '\'' +
-            .append("remark", getRemark())
+                ", attr1='" + attr1 + '\'' +
-            .append("attr1", getAttr1())
+                ", attr2='" + attr2 + '\'' +
-            .append("attr2", getAttr2())
+                ", attr3=" + attr3 +
-            .append("attr3", getAttr3())
+                ", attr4=" + attr4 +
-            .append("attr4", getAttr4())
+                ", children=" + children +
-            .append("createBy", getCreateBy())
+                '}';
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
     }
 }

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<WmStorageLocation> children;
+
     public void setWarehouseId(Long warehouseId) 
     {
         this.warehouseId = warehouseId;
@@ -142,24 +146,28 @@ public class WmWarehouse extends BaseEntity
         return attr4;
     }
 
+    public List<WmStorageLocation> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<WmStorageLocation> children) {
+        this.children = children;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return "WmWarehouse{" +
-            .append("warehouseId", getWarehouseId())
+                "warehouseId=" + warehouseId +
-            .append("warehouseCode", getWarehouseCode())
+                ", warehouseCode='" + warehouseCode + '\'' +
-            .append("warehouseName", getWarehouseName())
+                ", warehouseName='" + warehouseName + '\'' +
-            .append("location", getLocation())
+                ", location='" + location + '\'' +
-            .append("area", getArea())
+                ", area=" + area +
-            .append("charge", getCharge())
+                ", charge='" + charge + '\'' +
-            .append("remark", getRemark())
+                ", attr1='" + attr1 + '\'' +
-            .append("attr1", getAttr1())
+                ", attr2='" + attr2 + '\'' +
-            .append("attr2", getAttr2())
+                ", attr3=" + attr3 +
-            .append("attr3", getAttr3())
+                ", attr4=" + attr4 +
-            .append("attr4", getAttr4())
+                ", children=" + children +
-            .append("createBy", getCreateBy())
+                '}';
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
     }
 }

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<WmItemRecpt> 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);
+}

ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java

@@ -27,6 +27,8 @@ public interface WmWarehouseMapper
      */
     public List<WmWarehouse> selectWmWarehouseList(WmWarehouse wmWarehouse);
 
+    public List<WmWarehouse> getTreeList();
+
     public WmWarehouse checkWarehouseCodeUnique(WmWarehouse wmWarehouse);
     public WmWarehouse checkWarehouseNameUnique(WmWarehouse wmWarehouse);
 

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<WmItemRecpt> 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);
+}

ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java

@@ -27,6 +27,8 @@ public interface IWmWarehouseService
      */
     public List<WmWarehouse> selectWmWarehouseList(WmWarehouse wmWarehouse);
 
+    public List<WmWarehouse> getTreeList();
+
     /**
      * 检查仓库编码是否重复
      * @param wmWarehouse

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<WmItemRecpt> 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);
+    }
+}

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<WmWarehouse> getTreeList() {
+        return wmWarehouseMapper.getTreeList();
+    }
+
     @Override
     public String checkWarehouseCodeUnique(WmWarehouse wmWarehouse) {
         WmWarehouse warehouse = wmWarehouseMapper.checkWarehouseCodeUnique(wmWarehouse);

ktg-mes/src/main/resources/mapper/wm/WmItemRecptMapper.xml

@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ktg.mes.wm.mapper.WmItemRecptMapper">
+
+    <resultMap type="WmItemRecpt" id="WmItemRecptResult">
+        <result property="recptId"    column="recpt_id"    />
+        <result property="recptCode"    column="recpt_code"    />
+        <result property="recptName"    column="recpt_name"    />
+        <result property="iqcId"    column="iqc_id"    />
+        <result property="iqcCode"    column="iqc_code"    />
+        <result property="poCode"    column="po_code"    />
+        <result property="vendorId"    column="vendor_id"    />
+        <result property="vendorCode"    column="vendor_code"    />
+        <result property="vendorName"    column="vendor_name"    />
+        <result property="vendorNick"    column="vendor_nick"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="warehouseCode"    column="warehouse_code"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="locationId"    column="location_id"    />
+        <result property="locationCode"    column="location_code"    />
+        <result property="locationName"    column="location_name"    />
+        <result property="areaId"    column="area_id"    />
+        <result property="areaCode"    column="area_code"    />
+        <result property="areaName"    column="area_name"    />
+        <result property="recptDate"    column="recpt_date"    />
+        <result property="status"    column="status"    />
+        <result property="remark"    column="remark"    />
+        <result property="attr1"    column="attr1"    />
+        <result property="attr2"    column="attr2"    />
+        <result property="attr3"    column="attr3"    />
+        <result property="attr4"    column="attr4"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectWmItemRecptVo">
+        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
+    </sql>
+
+    <select id="selectWmItemRecptList" parameterType="WmItemRecpt" resultMap="WmItemRecptResult">
+        <include refid="selectWmItemRecptVo"/>
+        <where>
+            <if test="recptCode != null  and recptCode != ''"> and recpt_code = #{recptCode}</if>
+            <if test="recptName != null  and recptName != ''"> and recpt_name like concat('%', #{recptName}, '%')</if>
+            <if test="iqcId != null "> and iqc_id = #{iqcId}</if>
+            <if test="iqcCode != null  and iqcCode != ''"> and iqc_code = #{iqcCode}</if>
+            <if test="poCode != null  and poCode != ''"> and po_code = #{poCode}</if>
+            <if test="vendorId != null "> and vendor_id = #{vendorId}</if>
+            <if test="vendorCode != null  and vendorCode != ''"> and vendor_code = #{vendorCode}</if>
+            <if test="vendorName != null  and vendorName != ''"> and vendor_name like concat('%', #{vendorName}, '%')</if>
+            <if test="vendorNick != null  and vendorNick != ''"> and vendor_nick = #{vendorNick}</if>
+            <if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
+            <if test="warehouseCode != null  and warehouseCode != ''"> and warehouse_code = #{warehouseCode}</if>
+            <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
+            <if test="locationId != null "> and location_id = #{locationId}</if>
+            <if test="locationCode != null  and locationCode != ''"> and location_code = #{locationCode}</if>
+            <if test="locationName != null  and locationName != ''"> and location_name like concat('%', #{locationName}, '%')</if>
+            <if test="areaId != null "> and area_id = #{areaId}</if>
+            <if test="areaCode != null  and areaCode != ''"> and area_code = #{areaCode}</if>
+            <if test="areaName != null  and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
+            <if test="recptDate != null "> and recpt_date = #{recptDate}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+    </select>
+
+    <select id="selectWmItemRecptByRecptId" parameterType="Long" resultMap="WmItemRecptResult">
+        <include refid="selectWmItemRecptVo"/>
+        where recpt_id = #{recptId}
+    </select>
+
+
+    <select id="checkRecptCodeUnique" parameterType="WmItemRecpt" resultMap="WmItemRecptResult">
+        <include refid="selectWmItemRecptVo"/>
+        where recpt_code = #{recptCode}
+    </select>
+
+    <insert id="insertWmItemRecpt" parameterType="WmItemRecpt" useGeneratedKeys="true" keyProperty="recptId">
+        insert into wm_item_recpt
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="recptCode != null and recptCode != ''">recpt_code,</if>
+            <if test="recptName != null and recptName != ''">recpt_name,</if>
+            <if test="iqcId != null">iqc_id,</if>
+            <if test="iqcCode != null">iqc_code,</if>
+            <if test="poCode != null">po_code,</if>
+            <if test="vendorId != null">vendor_id,</if>
+            <if test="vendorCode != null">vendor_code,</if>
+            <if test="vendorName != null">vendor_name,</if>
+            <if test="vendorNick != null">vendor_nick,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="warehouseCode != null">warehouse_code,</if>
+            <if test="warehouseName != null">warehouse_name,</if>
+            <if test="locationId != null">location_id,</if>
+            <if test="locationCode != null">location_code,</if>
+            <if test="locationName != null">location_name,</if>
+            <if test="areaId != null">area_id,</if>
+            <if test="areaCode != null">area_code,</if>
+            <if test="areaName != null">area_name,</if>
+            <if test="recptDate != null">recpt_date,</if>
+            <if test="status != null">status,</if>
+            <if test="remark != null">remark,</if>
+            <if test="attr1 != null">attr1,</if>
+            <if test="attr2 != null">attr2,</if>
+            <if test="attr3 != null">attr3,</if>
+            <if test="attr4 != null">attr4,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="recptCode != null and recptCode != ''">#{recptCode},</if>
+            <if test="recptName != null and recptName != ''">#{recptName},</if>
+            <if test="iqcId != null">#{iqcId},</if>
+            <if test="iqcCode != null">#{iqcCode},</if>
+            <if test="poCode != null">#{poCode},</if>
+            <if test="vendorId != null">#{vendorId},</if>
+            <if test="vendorCode != null">#{vendorCode},</if>
+            <if test="vendorName != null">#{vendorName},</if>
+            <if test="vendorNick != null">#{vendorNick},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="warehouseCode != null">#{warehouseCode},</if>
+            <if test="warehouseName != null">#{warehouseName},</if>
+            <if test="locationId != null">#{locationId},</if>
+            <if test="locationCode != null">#{locationCode},</if>
+            <if test="locationName != null">#{locationName},</if>
+            <if test="areaId != null">#{areaId},</if>
+            <if test="areaCode != null">#{areaCode},</if>
+            <if test="areaName != null">#{areaName},</if>
+            <if test="recptDate != null">#{recptDate},</if>
+            <if test="status != null">#{status},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="attr1 != null">#{attr1},</if>
+            <if test="attr2 != null">#{attr2},</if>
+            <if test="attr3 != null">#{attr3},</if>
+            <if test="attr4 != null">#{attr4},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateWmItemRecpt" parameterType="WmItemRecpt">
+        update wm_item_recpt
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="recptCode != null and recptCode != ''">recpt_code = #{recptCode},</if>
+            <if test="recptName != null and recptName != ''">recpt_name = #{recptName},</if>
+            <if test="iqcId != null">iqc_id = #{iqcId},</if>
+            <if test="iqcCode != null">iqc_code = #{iqcCode},</if>
+            <if test="poCode != null">po_code = #{poCode},</if>
+            <if test="vendorId != null">vendor_id = #{vendorId},</if>
+            <if test="vendorCode != null">vendor_code = #{vendorCode},</if>
+            <if test="vendorName != null">vendor_name = #{vendorName},</if>
+            <if test="vendorNick != null">vendor_nick = #{vendorNick},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="warehouseCode != null">warehouse_code = #{warehouseCode},</if>
+            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
+            <if test="locationId != null">location_id = #{locationId},</if>
+            <if test="locationCode != null">location_code = #{locationCode},</if>
+            <if test="locationName != null">location_name = #{locationName},</if>
+            <if test="areaId != null">area_id = #{areaId},</if>
+            <if test="areaCode != null">area_code = #{areaCode},</if>
+            <if test="areaName != null">area_name = #{areaName},</if>
+            <if test="recptDate != null">recpt_date = #{recptDate},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="attr1 != null">attr1 = #{attr1},</if>
+            <if test="attr2 != null">attr2 = #{attr2},</if>
+            <if test="attr3 != null">attr3 = #{attr3},</if>
+            <if test="attr4 != null">attr4 = #{attr4},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where recpt_id = #{recptId}
+    </update>
+
+    <delete id="deleteWmItemRecptByRecptId" parameterType="Long">
+        delete from wm_item_recpt where recpt_id = #{recptId}
+    </delete>
+
+    <delete id="deleteWmItemRecptByRecptIds" parameterType="String">
+        delete from wm_item_recpt where recpt_id in
+        <foreach item="recptId" collection="array" open="(" separator="," close=")">
+            #{recptId}
+        </foreach>
+    </delete>
+</mapper>

ktg-mes/src/main/resources/mapper/wm/WmWarehouseMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ktg.mes.wm.mapper.WmWarehouseMapper">
     
     <resultMap type="WmWarehouse" id="WmWarehouseResult">
-        <result property="warehouseId"    column="warehouse_id"    />
+        <id property="warehouseId"    column="warehouse_id"    />
         <result property="warehouseCode"    column="warehouse_code"    />
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="location"    column="location"    />
@@ -20,8 +20,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <collection  property="children"   javaType="java.util.List"  resultMap="WmStorageLocationResult" />
     </resultMap>
 
+    <resultMap type="WmStorageLocation" id="WmStorageLocationResult">
+        <id property="locationId"    column="location_id"    />
+        <result property="locationCode"    column="location_code"    />
+        <result property="locationName"    column="location_name"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="area"    column="area"    />
+        <result property="areaFlag"    column="area_flag"    />
+        <collection  property="children"   javaType="java.util.List"  resultMap="WmStorageAreaResult" />
+    </resultMap>
+
+    <resultMap type="WmStorageArea" id="WmStorageAreaResult">
+        <id property="areaId"    column="area_id"    />
+        <result property="areaCode"    column="area_code"    />
+        <result property="areaName"    column="area_name"    />
+        <result property="locationId"    column="location_id"    />
+        <result property="area"    column="area"    />
+        <result property="maxLoa"    column="max_loa"    />
+        <result property="positionX"    column="position_x"    />
+        <result property="positionY"    column="position_y"    />
+        <result property="positionZ"    column="position_z"    />
+    </resultMap>
+
+
     <sql id="selectWmWarehouseVo">
         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
     </sql>
@@ -36,6 +60,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="charge != null  and charge != ''"> and charge = #{charge}</if>
         </where>
     </select>
+
+    <select id="getTreeList" resultMap="WmWarehouseResult">
+        SELECT w.warehouse_id, warehouse_code, warehouse_name, location, w.area, charge, w.remark, w.attr1, w.attr2, w.attr3, w.attr4, w.create_by, w.create_time, w.update_by, w.update_time,
+              l.location_id, location_code, location_name,  area_flag,
+              area_id, area_code, area_name, max_loa, position_x, position_y, position_z
+        FROM wm_warehouse w
+          LEFT JOIN wm_storage_location l ON w.warehouse_id = l.warehouse_id
+          LEFT JOIN wm_storage_area a ON l.location_id = a.location_id AND a.enable_flag = 'Y'
+    </select>
     
     <select id="selectWmWarehouseByWarehouseId" parameterType="Long" resultMap="WmWarehouseResult">
         <include refid="selectWmWarehouseVo"/>