From fcaed095ae7a55324b19e532c58b5379ca663fdd Mon Sep 17 00:00:00 2001
From: Tony <weijialin@inspur.com>
Date: Wed, 6 Dec 2023 17:56:59 +0800
Subject: [PATCH 1/2] fix: BUG

---
 god-ui/src/layout/components/Sidebar/Logo.vue | 2 +-
 god-ui/src/views/login.vue                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/god-ui/src/layout/components/Sidebar/Logo.vue b/god-ui/src/layout/components/Sidebar/Logo.vue
index 5eb9467f..b71a7b44 100644
--- a/god-ui/src/layout/components/Sidebar/Logo.vue
+++ b/god-ui/src/layout/components/Sidebar/Logo.vue
@@ -68,7 +68,7 @@ export default {
         this.title = '工程机械数字服务平台'
         document.title = '工程机械数字服务平台'
         break;
-      case '9230':
+      case '9260':
         this.title = '企业作业综合可视化监管平台'
         document.title = '企业作业综合可视化监管平台'
         break;
diff --git a/god-ui/src/views/login.vue b/god-ui/src/views/login.vue
index e84d1109..e7023df3 100644
--- a/god-ui/src/views/login.vue
+++ b/god-ui/src/views/login.vue
@@ -158,7 +158,7 @@ export default {
           loginDom.style.backgroundImage = 'url(/images/gongcheng-bg.png)'
           this.redirect = '/index'
           break;
-        case '9230':
+        case '9260':
           document.title = '企业作业综合可视化监管平台'
           loginDom.style.backgroundImage = 'url(/images/qiye-bg.png)'
           this.redirect = '/index'

From 5256e43614bbccdbae425dd3f55ef6c31a39749c Mon Sep 17 00:00:00 2001
From: wangyan21 <wangyan21@inspur.com>
Date: Thu, 7 Dec 2023 15:46:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?wms=E5=86=85=E9=83=A8=E9=A2=86=E6=96=99?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=A2=E6=88=B7=E6=9D=A5=E6=96=99=E5=8A=A0=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WmsMaterialManageController.java          | 104 +++++
 .../wmsProduct/domain/WmsMaterialManage.java  | 192 ++++++++
 .../mapper/WmsMaterialManageMapper.java       |  61 +++
 .../service/IWmsMaterialManageService.java    |  61 +++
 .../impl/WmsMaterialManageServiceImpl.java    |  92 ++++
 .../wmsProduct/WmsMaterialManageMapper.xml    | 112 +++++
 god-ui/src/api/wmsProduct/manage.js           |  44 ++
 .../src/views/wmsProduct/exchange/index.vue   | 372 +++++++++++++++
 .../src/views/wmsProduct/incoming/index.vue   | 426 ++++++++++++++++++
 .../src/views/wmsProduct/material/index.vue   | 384 ++++++++++++++++
 10 files changed, 1848 insertions(+)
 create mode 100644 God-Vue-master/god-admin/src/main/java/com/god/web/controller/wmsProduct/WmsMaterialManageController.java
 create mode 100644 God-Vue-master/god-system/src/main/java/com/god/wmsProduct/domain/WmsMaterialManage.java
 create mode 100644 God-Vue-master/god-system/src/main/java/com/god/wmsProduct/mapper/WmsMaterialManageMapper.java
 create mode 100644 God-Vue-master/god-system/src/main/java/com/god/wmsProduct/service/IWmsMaterialManageService.java
 create mode 100644 God-Vue-master/god-system/src/main/java/com/god/wmsProduct/service/impl/WmsMaterialManageServiceImpl.java
 create mode 100644 God-Vue-master/god-system/src/main/resources/mapper/wmsProduct/WmsMaterialManageMapper.xml
 create mode 100644 god-ui/src/api/wmsProduct/manage.js
 create mode 100644 god-ui/src/views/wmsProduct/exchange/index.vue
 create mode 100644 god-ui/src/views/wmsProduct/incoming/index.vue
 create mode 100644 god-ui/src/views/wmsProduct/material/index.vue

diff --git a/God-Vue-master/god-admin/src/main/java/com/god/web/controller/wmsProduct/WmsMaterialManageController.java b/God-Vue-master/god-admin/src/main/java/com/god/web/controller/wmsProduct/WmsMaterialManageController.java
new file mode 100644
index 00000000..19c6cabd
--- /dev/null
+++ b/God-Vue-master/god-admin/src/main/java/com/god/web/controller/wmsProduct/WmsMaterialManageController.java
@@ -0,0 +1,104 @@
+package com.god.web.controller.wmsProduct;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.god.common.annotation.Log;
+import com.god.common.core.controller.BaseController;
+import com.god.common.core.domain.AjaxResult;
+import com.god.common.enums.BusinessType;
+import com.god.wmsProduct.domain.WmsMaterialManage;
+import com.god.wmsProduct.service.IWmsMaterialManageService;
+import com.god.common.utils.poi.ExcelUtil;
+import com.god.common.core.page.TableDataInfo;
+
+/**
+ * 内部领料Controller
+ * 
+ * @author wangyan
+ * @date 2023-12-07
+ */
+@RestController
+@RequestMapping("/material/manage")
+public class WmsMaterialManageController extends BaseController
+{
+    @Autowired
+    private IWmsMaterialManageService wmsMaterialManageService;
+
+    /**
+     * 查询内部领料列表
+     */
+    @PreAuthorize("@ss.hasPermi('material:manage:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(WmsMaterialManage wmsMaterialManage)
+    {
+        startPage();
+        List<WmsMaterialManage> list = wmsMaterialManageService.selectWmsMaterialManageList(wmsMaterialManage);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出内部领料列表
+     */
+    @PreAuthorize("@ss.hasPermi('material:manage:export')")
+    @Log(title = "内部领料", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, WmsMaterialManage wmsMaterialManage)
+    {
+        List<WmsMaterialManage> list = wmsMaterialManageService.selectWmsMaterialManageList(wmsMaterialManage);
+        ExcelUtil<WmsMaterialManage> util = new ExcelUtil<WmsMaterialManage>(WmsMaterialManage.class);
+        util.exportExcel(response, list, "内部领料数据");
+    }
+
+    /**
+     * 获取内部领料详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('material:manage:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(wmsMaterialManageService.selectWmsMaterialManageById(id));
+    }
+
+    /**
+     * 新增内部领料
+     */
+    @PreAuthorize("@ss.hasPermi('material:manage:add')")
+    @Log(title = "内部领料", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody WmsMaterialManage wmsMaterialManage)
+    {
+        return toAjax(wmsMaterialManageService.insertWmsMaterialManage(wmsMaterialManage));
+    }
+
+    /**
+     * 修改内部领料
+     */
+    @PreAuthorize("@ss.hasPermi('material:manage:edit')")
+    @Log(title = "内部领料", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody WmsMaterialManage wmsMaterialManage)
+    {
+        return toAjax(wmsMaterialManageService.updateWmsMaterialManage(wmsMaterialManage));
+    }
+
+    /**
+     * 删除内部领料
+     */
+    @PreAuthorize("@ss.hasPermi('material:manage:remove')")
+    @Log(title = "内部领料", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(wmsMaterialManageService.deleteWmsMaterialManageByIds(ids));
+    }
+}
diff --git a/God-Vue-master/god-system/src/main/java/com/god/wmsProduct/domain/WmsMaterialManage.java b/God-Vue-master/god-system/src/main/java/com/god/wmsProduct/domain/WmsMaterialManage.java
new file mode 100644
index 00000000..9108bf4a
--- /dev/null
+++ b/God-Vue-master/god-system/src/main/java/com/god/wmsProduct/domain/WmsMaterialManage.java
@@ -0,0 +1,192 @@
+package com.god.wmsProduct.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.god.common.annotation.Excel;
+import com.god.common.core.domain.BaseEntity;
+
+/**
+ * 内部领料对象 wms_material_manage
+ * 
+ * @author wangyan
+ * @date 2023-12-07
+ */
+public class WmsMaterialManage extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private String id;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String productName;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    private String productType;
+
+    /** 数量 */
+    @Excel(name = "数量")
+    private String productNumber;
+
+    /** 重量 */
+    @Excel(name = "重量")
+    private String productWeight;
+
+    /** 部门信息 */
+    @Excel(name = "部门信息")
+    private String deptInfo;
+
+    /** 领料日期 */
+    @Excel(name = "领料日期")
+    private String applyTime;
+
+    /** 签字 */
+    @Excel(name = "签字")
+    private String signInfo;
+
+    /** 订单编号 */
+    @Excel(name = "订单编号")
+    private String orderInfo;
+
+    /** 处理时间 */
+    @Excel(name = "处理时间")
+    private String dealTime;
+
+    /** 处理人 */
+    @Excel(name = "处理人")
+    private String dealPerson;
+
+    /** 数据类型 */
+    @Excel(name = "数据类型")
+    private String dataType;
+
+    public void setId(String id) 
+    {
+        this.id = id;
+    }
+
+    public String getId() 
+    {
+        return id;
+    }
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+    public void setProductType(String productType) 
+    {
+        this.productType = productType;
+    }
+
+    public String getProductType() 
+    {
+        return productType;
+    }
+    public void setProductNumber(String productNumber) 
+    {
+        this.productNumber = productNumber;
+    }
+
+    public String getProductNumber() 
+    {
+        return productNumber;
+    }
+    public void setProductWeight(String productWeight) 
+    {
+        this.productWeight = productWeight;
+    }
+
+    public String getProductWeight() 
+    {
+        return productWeight;
+    }
+    public void setDeptInfo(String deptInfo) 
+    {
+        this.deptInfo = deptInfo;
+    }
+
+    public String getDeptInfo() 
+    {
+        return deptInfo;
+    }
+    public void setApplyTime(String applyTime) 
+    {
+        this.applyTime = applyTime;
+    }
+
+    public String getApplyTime() 
+    {
+        return applyTime;
+    }
+    public void setSignInfo(String signInfo) 
+    {
+        this.signInfo = signInfo;
+    }
+
+    public String getSignInfo() 
+    {
+        return signInfo;
+    }
+    public void setOrderInfo(String orderInfo) 
+    {
+        this.orderInfo = orderInfo;
+    }
+
+    public String getOrderInfo() 
+    {
+        return orderInfo;
+    }
+    public void setDealTime(String dealTime) 
+    {
+        this.dealTime = dealTime;
+    }
+
+    public String getDealTime() 
+    {
+        return dealTime;
+    }
+    public void setDealPerson(String dealPerson) 
+    {
+        this.dealPerson = dealPerson;
+    }
+
+    public String getDealPerson() 
+    {
+        return dealPerson;
+    }
+    public void setDataType(String dataType) 
+    {
+        this.dataType = dataType;
+    }
+
+    public String getDataType() 
+    {
+        return dataType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("productName", getProductName())
+            .append("productType", getProductType())
+            .append("productNumber", getProductNumber())
+            .append("productWeight", getProductWeight())
+            .append("deptInfo", getDeptInfo())
+            .append("applyTime", getApplyTime())
+            .append("signInfo", getSignInfo())
+            .append("orderInfo", getOrderInfo())
+            .append("dealTime", getDealTime())
+            .append("dealPerson", getDealPerson())
+            .append("remark", getRemark())
+            .append("dataType", getDataType())
+            .toString();
+    }
+}
diff --git a/God-Vue-master/god-system/src/main/java/com/god/wmsProduct/mapper/WmsMaterialManageMapper.java b/God-Vue-master/god-system/src/main/java/com/god/wmsProduct/mapper/WmsMaterialManageMapper.java
new file mode 100644
index 00000000..f8c603d0
--- /dev/null
+++ b/God-Vue-master/god-system/src/main/java/com/god/wmsProduct/mapper/WmsMaterialManageMapper.java
@@ -0,0 +1,61 @@
+package com.god.wmsProduct.mapper;
+
+import java.util.List;
+import com.god.wmsProduct.domain.WmsMaterialManage;
+
+/**
+ * 内部领料Mapper接口
+ * 
+ * @author wangyan
+ * @date 2023-12-07
+ */
+public interface WmsMaterialManageMapper 
+{
+    /**
+     * 查询内部领料
+     * 
+     * @param id 内部领料主键
+     * @return 内部领料
+     */
+    public WmsMaterialManage selectWmsMaterialManageById(String id);
+
+    /**
+     * 查询内部领料列表
+     * 
+     * @param wmsMaterialManage 内部领料
+     * @return 内部领料集合
+     */
+    public List<WmsMaterialManage> selectWmsMaterialManageList(WmsMaterialManage wmsMaterialManage);
+
+    /**
+     * 新增内部领料
+     * 
+     * @param wmsMaterialManage 内部领料
+     * @return 结果
+     */
+    public int insertWmsMaterialManage(WmsMaterialManage wmsMaterialManage);
+
+    /**
+     * 修改内部领料
+     * 
+     * @param wmsMaterialManage 内部领料
+     * @return 结果
+     */
+    public int updateWmsMaterialManage(WmsMaterialManage wmsMaterialManage);
+
+    /**
+     * 删除内部领料
+     * 
+     * @param id 内部领料主键
+     * @return 结果
+     */
+    public int deleteWmsMaterialManageById(String id);
+
+    /**
+     * 批量删除内部领料
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteWmsMaterialManageByIds(String[] ids);
+}
diff --git a/God-Vue-master/god-system/src/main/java/com/god/wmsProduct/service/IWmsMaterialManageService.java b/God-Vue-master/god-system/src/main/java/com/god/wmsProduct/service/IWmsMaterialManageService.java
new file mode 100644
index 00000000..2f7bef96
--- /dev/null
+++ b/God-Vue-master/god-system/src/main/java/com/god/wmsProduct/service/IWmsMaterialManageService.java
@@ -0,0 +1,61 @@
+package com.god.wmsProduct.service;
+
+import java.util.List;
+import com.god.wmsProduct.domain.WmsMaterialManage;
+
+/**
+ * 内部领料Service接口
+ * 
+ * @author wangyan
+ * @date 2023-12-07
+ */
+public interface IWmsMaterialManageService 
+{
+    /**
+     * 查询内部领料
+     * 
+     * @param id 内部领料主键
+     * @return 内部领料
+     */
+    public WmsMaterialManage selectWmsMaterialManageById(String id);
+
+    /**
+     * 查询内部领料列表
+     * 
+     * @param wmsMaterialManage 内部领料
+     * @return 内部领料集合
+     */
+    public List<WmsMaterialManage> selectWmsMaterialManageList(WmsMaterialManage wmsMaterialManage);
+
+    /**
+     * 新增内部领料
+     * 
+     * @param wmsMaterialManage 内部领料
+     * @return 结果
+     */
+    public int insertWmsMaterialManage(WmsMaterialManage wmsMaterialManage);
+
+    /**
+     * 修改内部领料
+     * 
+     * @param wmsMaterialManage 内部领料
+     * @return 结果
+     */
+    public int updateWmsMaterialManage(WmsMaterialManage wmsMaterialManage);
+
+    /**
+     * 批量删除内部领料
+     * 
+     * @param ids 需要删除的内部领料主键集合
+     * @return 结果
+     */
+    public int deleteWmsMaterialManageByIds(String[] ids);
+
+    /**
+     * 删除内部领料信息
+     * 
+     * @param id 内部领料主键
+     * @return 结果
+     */
+    public int deleteWmsMaterialManageById(String id);
+}
diff --git a/God-Vue-master/god-system/src/main/java/com/god/wmsProduct/service/impl/WmsMaterialManageServiceImpl.java b/God-Vue-master/god-system/src/main/java/com/god/wmsProduct/service/impl/WmsMaterialManageServiceImpl.java
new file mode 100644
index 00000000..eb86a36c
--- /dev/null
+++ b/God-Vue-master/god-system/src/main/java/com/god/wmsProduct/service/impl/WmsMaterialManageServiceImpl.java
@@ -0,0 +1,92 @@
+package com.god.wmsProduct.service.impl;
+
+import java.util.List;
+
+import com.god.common.utils.StringUtils;
+import com.god.common.utils.uuid.IdUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.god.wmsProduct.mapper.WmsMaterialManageMapper;
+import com.god.wmsProduct.domain.WmsMaterialManage;
+import com.god.wmsProduct.service.IWmsMaterialManageService;
+
+/**
+ * 内部领料Service业务层处理
+ *
+ * @author wangyan
+ * @date 2023-12-07
+ */
+@Service
+public class WmsMaterialManageServiceImpl implements IWmsMaterialManageService {
+    @Autowired
+    private WmsMaterialManageMapper wmsMaterialManageMapper;
+
+    /**
+     * 查询内部领料
+     *
+     * @param id 内部领料主键
+     * @return 内部领料
+     */
+    @Override
+    public WmsMaterialManage selectWmsMaterialManageById(String id) {
+        return wmsMaterialManageMapper.selectWmsMaterialManageById(id);
+    }
+
+    /**
+     * 查询内部领料列表
+     *
+     * @param wmsMaterialManage 内部领料
+     * @return 内部领料
+     */
+    @Override
+    public List<WmsMaterialManage> selectWmsMaterialManageList(WmsMaterialManage wmsMaterialManage) {
+        return wmsMaterialManageMapper.selectWmsMaterialManageList(wmsMaterialManage);
+    }
+
+    /**
+     * 新增内部领料
+     *
+     * @param wmsMaterialManage 内部领料
+     * @return 结果
+     */
+    @Override
+    public int insertWmsMaterialManage(WmsMaterialManage wmsMaterialManage) {
+        if (StringUtils.isBlank(wmsMaterialManage.getId())){
+            wmsMaterialManage.setId(IdUtils.fastSimpleUUID());
+        }
+        return wmsMaterialManageMapper.insertWmsMaterialManage(wmsMaterialManage);
+    }
+
+    /**
+     * 修改内部领料
+     *
+     * @param wmsMaterialManage 内部领料
+     * @return 结果
+     */
+    @Override
+    public int updateWmsMaterialManage(WmsMaterialManage wmsMaterialManage) {
+        return wmsMaterialManageMapper.updateWmsMaterialManage(wmsMaterialManage);
+    }
+
+    /**
+     * 批量删除内部领料
+     *
+     * @param ids 需要删除的内部领料主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWmsMaterialManageByIds(String[] ids) {
+        return wmsMaterialManageMapper.deleteWmsMaterialManageByIds(ids);
+    }
+
+    /**
+     * 删除内部领料信息
+     *
+     * @param id 内部领料主键
+     * @return 结果
+     */
+    @Override
+    public int deleteWmsMaterialManageById(String id) {
+        return wmsMaterialManageMapper.deleteWmsMaterialManageById(id);
+    }
+}
diff --git a/God-Vue-master/god-system/src/main/resources/mapper/wmsProduct/WmsMaterialManageMapper.xml b/God-Vue-master/god-system/src/main/resources/mapper/wmsProduct/WmsMaterialManageMapper.xml
new file mode 100644
index 00000000..56d3391b
--- /dev/null
+++ b/God-Vue-master/god-system/src/main/resources/mapper/wmsProduct/WmsMaterialManageMapper.xml
@@ -0,0 +1,112 @@
+<?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.god.wmsProduct.mapper.WmsMaterialManageMapper">
+    
+    <resultMap type="WmsMaterialManage" id="WmsMaterialManageResult">
+        <result property="id"    column="id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="productType"    column="product_type"    />
+        <result property="productNumber"    column="product_number"    />
+        <result property="productWeight"    column="product_weight"    />
+        <result property="deptInfo"    column="dept_info"    />
+        <result property="applyTime"    column="apply_time"    />
+        <result property="signInfo"    column="sign_info"    />
+        <result property="orderInfo"    column="order_info"    />
+        <result property="dealTime"    column="deal_time"    />
+        <result property="dealPerson"    column="deal_person"    />
+        <result property="remark"    column="remark"    />
+        <result property="dataType"    column="data_type"    />
+    </resultMap>
+
+    <sql id="selectWmsMaterialManageVo">
+        select id, product_name, product_type, product_number, product_weight, dept_info, apply_time, sign_info, order_info, deal_time, deal_person, remark, data_type from wms_material_manage
+    </sql>
+
+    <select id="selectWmsMaterialManageList" parameterType="WmsMaterialManage" resultMap="WmsMaterialManageResult">
+        <include refid="selectWmsMaterialManageVo"/>
+        <where>  
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="productType != null  and productType != ''"> and product_type = #{productType}</if>
+            <if test="productNumber != null  and productNumber != ''"> and product_number = #{productNumber}</if>
+            <if test="productWeight != null  and productWeight != ''"> and product_weight like concat('%', #{productWeight}, '%')</if>
+            <if test="deptInfo != null  and deptInfo != ''"> and dept_info like concat('%', #{deptInfo}, '%')</if>
+            <if test="params.beginApplyTime != null and params.beginApplyTime != '' and params.endApplyTime != null and params.endApplyTime != ''"> and apply_time between #{params.beginApplyTime} and #{params.endApplyTime}</if>
+            <if test="signInfo != null  and signInfo != ''"> and sign_info = #{signInfo}</if>
+            <if test="orderInfo != null  and orderInfo != ''"> and order_info like concat('%', #{orderInfo}, '%')</if>
+            <if test="dealTime != null  and dealTime != ''"> and deal_time &gt;= #{dealTime}</if>
+            <if test="dealPerson != null  and dealPerson != ''"> and deal_person like concat('%', #{dealPerson}, '%')</if>
+            <if test="dataType != null  and dataType != ''"> and data_type = #{dataType}</if>
+        </where>
+    </select>
+    
+    <select id="selectWmsMaterialManageById" parameterType="String" resultMap="WmsMaterialManageResult">
+        <include refid="selectWmsMaterialManageVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertWmsMaterialManage" parameterType="WmsMaterialManage">
+        insert into wms_material_manage
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="productType != null">product_type,</if>
+            <if test="productNumber != null">product_number,</if>
+            <if test="productWeight != null">product_weight,</if>
+            <if test="deptInfo != null">dept_info,</if>
+            <if test="applyTime != null">apply_time,</if>
+            <if test="signInfo != null">sign_info,</if>
+            <if test="orderInfo != null">order_info,</if>
+            <if test="dealTime != null">deal_time,</if>
+            <if test="dealPerson != null">deal_person,</if>
+            <if test="remark != null">remark,</if>
+            <if test="dataType != null">data_type,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="productType != null">#{productType},</if>
+            <if test="productNumber != null">#{productNumber},</if>
+            <if test="productWeight != null">#{productWeight},</if>
+            <if test="deptInfo != null">#{deptInfo},</if>
+            <if test="applyTime != null">#{applyTime},</if>
+            <if test="signInfo != null">#{signInfo},</if>
+            <if test="orderInfo != null">#{orderInfo},</if>
+            <if test="dealTime != null">#{dealTime},</if>
+            <if test="dealPerson != null">#{dealPerson},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="dataType != null">#{dataType},</if>
+         </trim>
+    </insert>
+
+    <update id="updateWmsMaterialManage" parameterType="WmsMaterialManage">
+        update wms_material_manage
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="productType != null">product_type = #{productType},</if>
+            <if test="productNumber != null">product_number = #{productNumber},</if>
+            <if test="productWeight != null">product_weight = #{productWeight},</if>
+            <if test="deptInfo != null">dept_info = #{deptInfo},</if>
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
+            <if test="signInfo != null">sign_info = #{signInfo},</if>
+            <if test="orderInfo != null">order_info = #{orderInfo},</if>
+            <if test="dealTime != null">deal_time = #{dealTime},</if>
+            <if test="dealPerson != null">deal_person = #{dealPerson},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="dataType != null">data_type = #{dataType},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteWmsMaterialManageById" parameterType="String">
+        delete from wms_material_manage where id = #{id}
+    </delete>
+
+    <delete id="deleteWmsMaterialManageByIds" parameterType="String">
+        delete from wms_material_manage where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/god-ui/src/api/wmsProduct/manage.js b/god-ui/src/api/wmsProduct/manage.js
new file mode 100644
index 00000000..8e05fb36
--- /dev/null
+++ b/god-ui/src/api/wmsProduct/manage.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询内部领料列表
+export function listManage(query) {
+  return request({
+    url: '/material/manage/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询内部领料详细
+export function getManage(id) {
+  return request({
+    url: '/material/manage/' + id,
+    method: 'get'
+  })
+}
+
+// 新增内部领料
+export function addManage(data) {
+  return request({
+    url: '/material/manage',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改内部领料
+export function updateManage(data) {
+  return request({
+    url: '/material/manage',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除内部领料
+export function delManage(id) {
+  return request({
+    url: '/material/manage/' + id,
+    method: 'delete'
+  })
+}
diff --git a/god-ui/src/views/wmsProduct/exchange/index.vue b/god-ui/src/views/wmsProduct/exchange/index.vue
new file mode 100644
index 00000000..46f09e73
--- /dev/null
+++ b/god-ui/src/views/wmsProduct/exchange/index.vue
@@ -0,0 +1,372 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
+      <el-form-item label="产品名称" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入产品名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户信息" prop="deptInfo">
+        <el-input
+          v-model="queryParams.deptInfo"
+          placeholder="请输入客户信息"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申请日期">
+        <el-date-picker
+          v-model="daterangeApplyTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="退换货单号" prop="orderInfo">
+        <el-input
+          v-model="queryParams.orderInfo"
+          placeholder="请输入退换货单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="处理时间" prop="dealTime">
+        <el-date-picker clearable
+          v-model="queryParams.dealTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择处理时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="处理人" prop="dealPerson">
+        <el-input
+          v-model="queryParams.dealPerson"
+          placeholder="请输入处理人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['material:manage:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['material:manage:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['material:manage:remove']"
+        >删除</el-button>
+      </el-col>
+
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="manageList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="产品信息" align="center" prop="productName" />
+      <el-table-column label="退货原因" align="center" prop="productType" />
+      <el-table-column label="退货状态" align="center" prop="productNumber" >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.productNumber === '已发货'">已发货</el-tag>
+          <el-tag type="warning" v-else-if="scope.row.productNumber === '已签收'">已签收</el-tag>
+          <el-tag type="info" v-else-if="scope.row.productNumber === '未发货'">未发货</el-tag>
+          <div v-else>{{scope.row.productNumber}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品缺陷类型" align="center" prop="productWeight" />
+      <el-table-column label="客户信息" align="center" prop="deptInfo" />
+      <el-table-column label="申请日期" align="center" prop="applyTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="退换货单号" align="center" prop="orderInfo" />
+      <el-table-column label="处理时间" align="center" prop="dealTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.dealTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="处理人" align="center" prop="dealPerson" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['material:manage:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['material:manage:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改内部领料对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="产品信息" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入产品信息" />
+        </el-form-item>
+        <el-form-item label="退货原因" prop="productType">
+          <el-input v-model="form.productType" placeholder="请输入退货原因" />
+        </el-form-item>
+        <el-form-item label="退货状态" prop="productNumber">
+          <el-input v-model="form.productNumber" placeholder="请输入退货状态" />
+        </el-form-item>
+        <el-form-item label="产品缺陷类型" prop="productWeight">
+          <el-input v-model="form.productWeight" placeholder="请输入产品缺陷类型" />
+        </el-form-item>
+        <el-form-item label="客户信息" prop="deptInfo">
+          <el-input v-model="form.deptInfo" placeholder="请输入客户信息" />
+        </el-form-item>
+        <el-form-item label="申请日期" prop="applyTime">
+          <el-date-picker clearable
+            v-model="form.applyTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择申请日期">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="退换货单号" prop="orderInfo">
+          <el-input v-model="form.orderInfo" placeholder="请输入退换货单号" />
+        </el-form-item>
+        <el-form-item label="处理时间" prop="dealTime">
+          <el-date-picker clearable
+            v-model="form.dealTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择处理时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="处理人" prop="dealPerson">
+          <el-input v-model="form.dealPerson" placeholder="请输入处理人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listManage, getManage, delManage, addManage, updateManage } from "@/api/wmsProduct/manage";
+
+export default {
+  //客户产品退换货
+  name: "ProductExchange",
+  dicts: ['sys_yes_no'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 内部领料表格数据
+      manageList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 数据类型时间范围
+      daterangeApplyTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        productName: null,
+        productType: null,
+        productNumber: null,
+        productWeight: null,
+        deptInfo: null,
+        applyTime: null,
+        signInfo: null,
+        orderInfo: null,
+        dealTime: null,
+        dealPerson: null,
+        dataType: "客户产品退换货"
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询内部领料列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeApplyTime && '' != this.daterangeApplyTime) {
+        this.queryParams.params["beginApplyTime"] = this.daterangeApplyTime[0];
+        this.queryParams.params["endApplyTime"] = this.daterangeApplyTime[1];
+      }
+      listManage(this.queryParams).then(response => {
+        this.manageList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        productName: null,
+        productType: null,
+        productNumber: null,
+        productWeight: null,
+        deptInfo: null,
+        applyTime: null,
+        signInfo: null,
+        orderInfo: null,
+        dealTime: null,
+        dealPerson: null,
+        remark: null,
+        dataType: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeApplyTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加客户产品退换货信息";
+      this.form.dataType = "客户产品退换货";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getManage(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改客户产品退换货信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateManage(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addManage(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除客户产品退换货信息编号为"' + ids + '"的数据项？').then(function() {
+        return delManage(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('material/manage/export', {
+        ...this.queryParams
+      }, `manage_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/god-ui/src/views/wmsProduct/incoming/index.vue b/god-ui/src/views/wmsProduct/incoming/index.vue
new file mode 100644
index 00000000..6a2dbeb9
--- /dev/null
+++ b/god-ui/src/views/wmsProduct/incoming/index.vue
@@ -0,0 +1,426 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="原料名称" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入原料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原料类型" prop="productType">
+        <el-input
+          v-model="queryParams.productType"
+          placeholder="请输入原料类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原料数量" prop="productNumber">
+        <el-input
+          v-model="queryParams.productNumber"
+          placeholder="请输入原料数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="原料重量" prop="productWeight">
+        <el-input
+          v-model="queryParams.productWeight"
+          placeholder="请输入原料重量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户名称" prop="customerName">
+        <el-input
+          v-model="queryParams.customerName"
+          placeholder="请输入客户名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="加工流程" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入加工流程"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="加工人员" prop="phoneInfo">
+        <el-input
+          v-model="queryParams.phoneInfo"
+          placeholder="请输入加工人员"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="送货日期">
+        <el-date-picker
+          v-model="daterangeOutTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="交货时间" prop="auditTime">
+        <el-date-picker clearable
+          v-model="queryParams.auditTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择交货时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="加工进度" prop="auditResult">
+        <el-input
+          v-model="queryParams.auditResult"
+          placeholder="请输入加工进度"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['product:delivery:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['product:delivery:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['product:delivery:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['product:delivery:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="deliveryList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="原料名称" align="center" prop="productName" />
+      <el-table-column label="原料类型" align="center" prop="productType" />
+      <el-table-column label="原料数量" align="center" prop="productNumber" />
+      <el-table-column label="原料重量" align="center" prop="productWeight" />
+      <el-table-column label="客户名称" align="center" prop="customerName" />
+      <el-table-column label="加工流程" align="center" prop="address" />
+      <el-table-column label="加工人员" align="center" prop="phoneInfo" />
+      <el-table-column label="原料到厂日期" align="center" prop="outTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单编号" align="center" prop="orderInfo" />
+      <el-table-column label="交货时间" align="center" prop="auditTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.auditTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="加工进度" align="center" prop="auditResult" >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.auditResult === '进行中'">进行中</el-tag>
+          <el-tag type="warning" v-else-if="scope.row.auditResult === '已完成'">已完成</el-tag>
+          <el-tag type="info" v-else-if="scope.row.auditResult === '未开始'">未开始</el-tag>
+          <div v-else>{{scope.row.auditResult}}</div>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="数据类型" align="center" prop="dataType" />-->
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['product:delivery:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['product:delivery:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改车辆出厂重量确定对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="原料名称" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入产品名称" />
+        </el-form-item>
+        <el-form-item label="原料类型" prop="productType">
+          <el-input v-model="form.productType" placeholder="请输入产品类型" />
+        </el-form-item>
+        <el-form-item label="原料数量" prop="productNumber">
+          <el-input v-model="form.productNumber" placeholder="请输入货物数量" />
+        </el-form-item>
+        <el-form-item label="原料重量" prop="productWeight">
+          <el-input v-model="form.productWeight" placeholder="请输入货物重量" />
+        </el-form-item>
+        <el-form-item label="客户名称" prop="customerName">
+          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
+        </el-form-item>
+        <el-form-item label="加工流程" prop="address">
+          <el-input v-model="form.address" placeholder="请输入客户地址" />
+        </el-form-item>
+        <el-form-item label="加工人员" prop="phoneInfo">
+          <el-input v-model="form.phoneInfo" placeholder="请输入客户电话" />
+        </el-form-item>
+        <el-form-item label="原料到厂日期" prop="outTime">
+          <el-date-picker clearable
+            v-model="form.outTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择原料到厂日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="订单编号" prop="orderInfo">
+          <el-input v-model="form.orderInfo" placeholder="请输入订单编号" />
+        </el-form-item>
+        <el-form-item label="约定交货时间" prop="auditTime">
+          <el-date-picker clearable
+            v-model="form.auditTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择约定交货时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="加工进度" prop="auditResult">
+          <el-input v-model="form.auditResult" placeholder="请输入审核结果" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDelivery, getDelivery, delDelivery, addDelivery, updateDelivery } from "@/api/wmsProduct/delivery";
+
+export default {
+  //客户来料加工
+  name: "MaterialDelivery",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 车辆出厂重量确定表格数据
+      deliveryList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 备注时间范围
+      daterangeOutTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        productName: null,
+        productType: null,
+        productNumber: null,
+        productWeight: null,
+        customerName: null,
+        address: null,
+        phoneInfo: null,
+        outTime: null,
+        outNumber: null,
+        orderInfo: null,
+        auditTime: null,
+        auditResult: null,
+        dataType: "客户来料加工",
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询车辆出厂重量确定列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeOutTime && '' != this.daterangeOutTime) {
+        this.queryParams.params["beginOutTime"] = this.daterangeOutTime[0];
+        this.queryParams.params["endOutTime"] = this.daterangeOutTime[1];
+      }
+      listDelivery(this.queryParams).then(response => {
+        this.deliveryList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        productName: null,
+        productType: null,
+        productNumber: null,
+        productWeight: null,
+        customerName: null,
+        address: null,
+        phoneInfo: null,
+        outTime: null,
+        outNumber: null,
+        orderInfo: null,
+        auditTime: null,
+        auditResult: null,
+        dataType: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeOutTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加客户来料加工信息";
+      this.form.dataType="客户来料加工";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getDelivery(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改客户来料加工信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDelivery(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDelivery(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除客户来料加工编号为"' + ids + '"的数据项？').then(function() {
+        return delDelivery(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('product/delivery/export', {
+        ...this.queryParams
+      }, `delivery_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/god-ui/src/views/wmsProduct/material/index.vue b/god-ui/src/views/wmsProduct/material/index.vue
new file mode 100644
index 00000000..23bb881e
--- /dev/null
+++ b/god-ui/src/views/wmsProduct/material/index.vue
@@ -0,0 +1,384 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="物料名称" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入物料名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料类型" prop="productType">
+        <el-input
+          v-model="queryParams.productType"
+          placeholder="请输入类型"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料数量" prop="productNumber">
+        <el-input
+          v-model="queryParams.productNumber"
+          placeholder="请输入数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="物料重量" prop="productWeight">
+        <el-input
+          v-model="queryParams.productWeight"
+          placeholder="请输入重量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="领料部门" prop="deptInfo">
+        <el-input
+          v-model="queryParams.deptInfo"
+          placeholder="请输入部门信息"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="领料日期">
+        <el-date-picker
+          v-model="daterangeApplyTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="是否签字" prop="signInfo">
+        <el-select v-model="queryParams.signInfo" placeholder="请选择签字" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="订单编号" prop="orderInfo">
+        <el-input
+          v-model="queryParams.orderInfo"
+          placeholder="请输入订单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['material:manage:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['material:manage:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['material:manage:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="manageList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+
+      <el-table-column label="物料名称" align="center" prop="productName" />
+      <el-table-column label="物料类型" align="center" prop="productType" />
+      <el-table-column label="物料数量" align="center" prop="productNumber" />
+      <el-table-column label="物料重量" align="center" prop="productWeight" />
+      <el-table-column label="领料部门" align="center" prop="deptInfo" />
+      <el-table-column label="领料日期" align="center" prop="applyTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否签字" align="center" prop="signInfo">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.signInfo"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="订单编号" align="center" prop="orderInfo" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['material:manage:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['material:manage:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改内部领料对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="物料名称" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="物料类型" prop="productType">
+          <el-input v-model="form.productType" placeholder="请输入类型" />
+        </el-form-item>
+        <el-form-item label="物料数量" prop="productNumber">
+          <el-input v-model="form.productNumber" placeholder="请输入数量" />
+        </el-form-item>
+        <el-form-item label="物料重量" prop="productWeight">
+          <el-input v-model="form.productWeight" placeholder="请输入重量" />
+        </el-form-item>
+        <el-form-item label="领料部门" prop="deptInfo">
+          <el-input v-model="form.deptInfo" placeholder="请输入部门信息" />
+        </el-form-item>
+        <el-form-item label="领料日期" prop="applyTime">
+          <el-date-picker clearable
+            v-model="form.applyTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择领料日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="是否签字" prop="signInfo">
+          <el-select v-model="form.signInfo" placeholder="请选择是否签字">
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="订单编号" prop="orderInfo">
+          <el-input v-model="form.orderInfo" placeholder="请输入订单编号" />
+        </el-form-item>
+
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="数据类型" prop="dataType">
+          <el-input v-model="form.dataType" placeholder="请输入数据类型" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listManage, getManage, delManage, addManage, updateManage } from "@/api/wmsProduct/manage";
+
+export default {
+  //内部领料
+  name: "MaterialManage",
+  dicts: ['sys_yes_no'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 内部领料表格数据
+      manageList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 数据类型时间范围
+      daterangeApplyTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        productName: null,
+        productType: null,
+        productNumber: null,
+        productWeight: null,
+        deptInfo: null,
+        applyTime: null,
+        signInfo: null,
+        orderInfo: null,
+        dealTime: null,
+        dealPerson: null,
+        dataType: "内部领料"
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询内部领料列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.params = {};
+      if (null != this.daterangeApplyTime && '' != this.daterangeApplyTime) {
+        this.queryParams.params["beginApplyTime"] = this.daterangeApplyTime[0];
+        this.queryParams.params["endApplyTime"] = this.daterangeApplyTime[1];
+      }
+      listManage(this.queryParams).then(response => {
+        this.manageList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        productName: null,
+        productType: null,
+        productNumber: null,
+        productWeight: null,
+        deptInfo: null,
+        applyTime: null,
+        signInfo: null,
+        orderInfo: null,
+        dealTime: null,
+        dealPerson: null,
+        remark: null,
+        dataType: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeApplyTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加内部领料信息";
+      this.form.dataType = "内部领料";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getManage(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改内部领料信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateManage(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addManage(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除内部领料编号为"' + ids + '"的数据项？').then(function() {
+        return delManage(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('material/manage/export', {
+        ...this.queryParams
+      }, `manage_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>