diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/controller/MaterialRequisitionHeadController.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/controller/MaterialRequisitionHeadController.java
deleted file mode 100644
index 614040cd..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/produce/controller/MaterialRequisitionHeadController.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.ruoyi.produce.controller;
-
-import com.alibaba.druid.util.StringUtils;
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.ck.utils.Result;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.produce.domain.MaterialRequisitionHead;
-import com.ruoyi.produce.domain.MaterialRequisitionHeadWithList;
-import com.ruoyi.produce.domain.MaterialRequisitionList;
-import com.ruoyi.produce.service.IMaterialRequisitionHeadService;
-import com.ruoyi.produce.service.IMaterialRequisitionListService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 领料单Controller
- *
- * @author ruoyi
- * @date 2022-01-06
- */
-@Controller
-@RequestMapping("/produce/materialRequisitionHead")
-public class MaterialRequisitionHeadController extends BaseController {
-    private String prefix = "produce/materialRequisitionHead";
-
-    @Autowired
-    private IMaterialRequisitionHeadService materialRequisitionHeadService;
-
-    @Autowired
-    private IMaterialRequisitionListService materialRequisitionListService;
-
-    @RequiresPermissions("produce:materialRequisitionHead:view")
-    @GetMapping()
-    public String materialRequisitionHead() {
-        return prefix + "/materialRequisitionHead";
-    }
-
-    /**
-     * 查询领料单列表
-     */
-    @RequiresPermissions("produce:materialRequisitionHead:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(MaterialRequisitionHead materialRequisitionHead) {
-        startPage();
-        List<MaterialRequisitionHead> list = materialRequisitionHeadService.selectMaterialRequisitionHeadList(materialRequisitionHead);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出领料单列表
-     */
-    @RequiresPermissions("produce:materialRequisitionHead:export")
-    @Log(title = "领料单", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    @ResponseBody
-    public AjaxResult export(MaterialRequisitionHead materialRequisitionHead) {
-        List<MaterialRequisitionHead> list = materialRequisitionHeadService.selectMaterialRequisitionHeadList(materialRequisitionHead);
-        ExcelUtil<MaterialRequisitionHead> util = new ExcelUtil<MaterialRequisitionHead>(MaterialRequisitionHead.class);
-        return util.exportExcel(list, "领料单数据");
-    }
-
-    /**
-     * 新增领料单
-     */
-    @GetMapping("/add")
-    public String add() {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存领料单
-     */
-    @RequiresPermissions("produce:materialRequisitionHead:add")
-    @Log(title = "领料单", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public Result addSave(String jsonStr) throws Exception {
-        JSONObject jsonObject = JSONObject.parseObject(jsonStr);
-        MaterialRequisitionHead materialRequisitionHead = jsonObject.toJavaObject(MaterialRequisitionHead.class);
-        String materialRequisitionNo = materialRequisitionHead.getMaterialRequisitionNo();
-        if (StringUtils.isEmpty(materialRequisitionNo)) {
-            return Result.getFailResult("请输入领料单号！", null);
-        }
-        String workOrderNo = materialRequisitionHead.getWorkOrderNo();
-        String outsourceOrderNo = materialRequisitionHead.getOutsourceOrderNo();
-        if (StringUtils.isEmpty(workOrderNo) && StringUtils.isEmpty(outsourceOrderNo)) {
-            return Result.getFailResult("请选择制工单或委外单！", null);
-        }
-        List<MaterialRequisitionList> list = materialRequisitionHead.getMaterialRequisitionLists();
-        for (MaterialRequisitionList each : list) {
-            Long planQty = each.getPlanQty();
-            if (planQty == null || planQty <= 0) {
-                return Result.getFailResult("计划数量不能小于0！", null);
-            }
-            String spare2 = each.getSpare2();
-            if (Integer.parseInt(spare2) <= 0) {
-                return Result.getFailResult("使用量不能小于0！", null);
-            }
-        }
-        int i = materialRequisitionHeadService.insertMaterialRequisitionHead(materialRequisitionHead);
-        return Result.getSuccessResult(i);
-    }
-
-    /**
-     * 修改领料单
-     */
-    @GetMapping("/edit/{materialRequisitionNo}")
-    public String edit(@PathVariable("materialRequisitionNo") String materialRequisitionNo, ModelMap mmap) {
-        MaterialRequisitionHead materialRequisitionHead = materialRequisitionHeadService.selectMaterialRequisitionHeadById(materialRequisitionNo);
-        MaterialRequisitionList materialRequisitionList = new MaterialRequisitionList();
-        materialRequisitionList.setMaterialRequisitionNo(materialRequisitionNo);
-        List<MaterialRequisitionList> list = materialRequisitionListService.selectMaterialRequisitionListList(materialRequisitionList);
-        mmap.put("materialRequisitionHead", materialRequisitionHead);
-        mmap.put("list", list);
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存领料单
-     */
-    @RequiresPermissions("produce:materialRequisitionHead:edit")
-    @Log(title = "领料单", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public Result editSave(String jsonStr) throws Exception {
-        JSONObject jsonObject = JSONObject.parseObject(jsonStr);
-        MaterialRequisitionHead materialRequisitionHead = jsonObject.toJavaObject(MaterialRequisitionHead.class);
-        String materialRequisitionNo = materialRequisitionHead.getMaterialRequisitionNo();
-        if (StringUtils.isEmpty(materialRequisitionNo)) {
-            return Result.getFailResult("请输入领料单号！", null);
-        }
-        String workOrderNo = materialRequisitionHead.getWorkOrderNo();
-        String outsourceOrderNo = materialRequisitionHead.getOutsourceOrderNo();
-        if (StringUtils.isEmpty(workOrderNo) && StringUtils.isEmpty(outsourceOrderNo)) {
-            return Result.getFailResult("请选择制工单或委外单！", null);
-        }
-        List<MaterialRequisitionList> list = materialRequisitionHead.getMaterialRequisitionLists();
-        for (MaterialRequisitionList each : list) {
-            Long planQty = each.getPlanQty();
-            if (planQty == null || planQty <= 0) {
-                return Result.getFailResult("计划数量不能小于0！", null);
-            }
-            String spare2 = each.getSpare2();
-            if (Integer.parseInt(spare2) <= 0) {
-                return Result.getFailResult("使用量不能小于0！", null);
-            }
-        }
-        int i = materialRequisitionHeadService.updateMaterialRequisitionHead(materialRequisitionHead);
-        return Result.getSuccessResult(i);
-    }
-
-    /**
-     * 删除领料单
-     */
-    @RequiresPermissions("produce:materialRequisitionHead:remove")
-    @Log(title = "领料单", businessType = BusinessType.DELETE)
-    @PostMapping("/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids) {
-        return toAjax(materialRequisitionHeadService.deleteMaterialRequisitionHeadByIds(ids));
-    }
-
-    @PostMapping("/headWithList")
-    @ResponseBody
-    public TableDataInfo selectHeadWithList(MaterialRequisitionHeadWithList materialRequisitionHeadWithList) throws Exception {
-        startPage();
-        List<MaterialRequisitionHeadWithList> list = materialRequisitionHeadService.selectHeadWithList(materialRequisitionHeadWithList);
-        System.out.println(list);
-        return getDataTable(list);
-    }
-
-    @PostMapping("/end")
-    @ResponseBody
-    public Result end(MaterialRequisitionHead materialRequisitionHead) throws Exception {
-        materialRequisitionHead.setEndFlag("1");
-        return Result.getSuccessResult(materialRequisitionHeadService.updateMaterialRequisitionHead(materialRequisitionHead));
-    }
-
-    @PostMapping("/id")
-    @ResponseBody
-    public Result getId() throws Exception {
-        return Result.getSuccessResult(materialRequisitionHeadService.getId());
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/domain/MaterialRequisitionHead.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/domain/MaterialRequisitionHead.java
deleted file mode 100644
index 8ad9f969..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/produce/domain/MaterialRequisitionHead.java
+++ /dev/null
@@ -1,462 +0,0 @@
-package com.ruoyi.produce.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 领料单对象 material_requisition_head
- * 
- * @author ruoyi
- * @date 2022-01-06
- */
-public class MaterialRequisitionHead extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 领料单号 */
-    @Excel(name = "领料单号")
-    private String materialRequisitionNo;
-
-    /** 制工单号 */
-    @Excel(name = "制工单号")
-    private String workOrderNo;
-
-    /** 部门名称 */
-    @Excel(name = "部门名称")
-    private String departmentName;
-
-    /** 领料人 */
-    @Excel(name = "领料人")
-    private String linkman;
-
-    /** 仓库号 */
-    @Excel(name = "仓库号")
-    private String stockNo;
-
-    /** 仓库名称 */
-    @Excel(name = "仓库名称")
-    private String stockName;
-
-    /** 出库类型 */
-    @Excel(name = "出库类型")
-    private String outputClass;
-
-    /** 领料日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "领料日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date outputDate;
-
-    /** 结案否 */
-    @Excel(name = "结案否")
-    private String endFlag;
-
-    /** 物料类别 */
-    @Excel(name = "物料类别")
-    private String itemClass;
-
-    /** 确认否 */
-    @Excel(name = "确认否")
-    private String confirmFlag;
-
-    /** 确认人 */
-    @Excel(name = "确认人")
-    private String confirmMan;
-
-    /** 确认时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "确认时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date confirmDate;
-
-    /** 审核否 */
-    @Excel(name = "审核否")
-    private String auditingFlag;
-
-    /** 审核人 */
-    @Excel(name = "审核人")
-    private String auditingMan;
-
-    /** 审核日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date auditingDate;
-
-    /** 核准否 */
-    @Excel(name = "核准否")
-    private String approveFlag;
-
-    /** 核准人 */
-    @Excel(name = "核准人")
-    private String approveMan;
-
-    /** 核准日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "核准日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date spproveDate;
-
-    /** 开单日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开单日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date createDate;
-
-    /** 委外单号 */
-    @Excel(name = "委外单号")
-    private String outsourceOrderNo;
-
-    /** 领料否 */
-    @Excel(name = "领料否")
-    private String getFlag;
-
-    /** 订单号 */
-    @Excel(name = "订单号")
-    private String orderNo;
-
-    /** 生产批号 */
-    @Excel(name = "生产批号")
-    private String batchNum;
-
-    /** 成品代码 */
-    @Excel(name = "成品代码")
-    private String spare1;
-
-    /** 工单数量 */
-    @Excel(name = "工单数量")
-    private String spare2;
-
-    /**  */
-    @Excel(name = "")
-    private String spare3;
-
-    /**  */
-    @Excel(name = "")
-    private String spare4;
-
-    /**  */
-    @Excel(name = "")
-    private String spare5;
-
-    /**  */
-    @Excel(name = "")
-    private String spare6;
-
-    private List<MaterialRequisitionList> materialRequisitionLists;
-
-    public List<MaterialRequisitionList> getMaterialRequisitionLists() {
-        return materialRequisitionLists;
-    }
-
-    public void setMaterialRequisitionLists(List<MaterialRequisitionList> materialRequisitionLists) {
-        this.materialRequisitionLists = materialRequisitionLists;
-    }
-
-    public void setMaterialRequisitionNo(String materialRequisitionNo)
-    {
-        this.materialRequisitionNo = materialRequisitionNo;
-    }
-
-    public String getMaterialRequisitionNo() 
-    {
-        return materialRequisitionNo;
-    }
-    public void setWorkOrderNo(String workOrderNo) 
-    {
-        this.workOrderNo = workOrderNo;
-    }
-
-    public String getWorkOrderNo() 
-    {
-        return workOrderNo;
-    }
-    public void setDepartmentName(String departmentName) 
-    {
-        this.departmentName = departmentName;
-    }
-
-    public String getDepartmentName() 
-    {
-        return departmentName;
-    }
-    public void setLinkman(String linkman) 
-    {
-        this.linkman = linkman;
-    }
-
-    public String getLinkman() 
-    {
-        return linkman;
-    }
-    public void setStockNo(String stockNo) 
-    {
-        this.stockNo = stockNo;
-    }
-
-    public String getStockNo() 
-    {
-        return stockNo;
-    }
-    public void setStockName(String stockName) 
-    {
-        this.stockName = stockName;
-    }
-
-    public String getStockName() 
-    {
-        return stockName;
-    }
-    public void setOutputClass(String outputClass) 
-    {
-        this.outputClass = outputClass;
-    }
-
-    public String getOutputClass() 
-    {
-        return outputClass;
-    }
-    public void setOutputDate(Date outputDate) 
-    {
-        this.outputDate = outputDate;
-    }
-
-    public Date getOutputDate() 
-    {
-        return outputDate;
-    }
-    public void setEndFlag(String endFlag) 
-    {
-        this.endFlag = endFlag;
-    }
-
-    public String getEndFlag() 
-    {
-        return endFlag;
-    }
-    public void setItemClass(String itemClass) 
-    {
-        this.itemClass = itemClass;
-    }
-
-    public String getItemClass() 
-    {
-        return itemClass;
-    }
-    public void setConfirmFlag(String confirmFlag) 
-    {
-        this.confirmFlag = confirmFlag;
-    }
-
-    public String getConfirmFlag() 
-    {
-        return confirmFlag;
-    }
-    public void setConfirmMan(String confirmMan) 
-    {
-        this.confirmMan = confirmMan;
-    }
-
-    public String getConfirmMan() 
-    {
-        return confirmMan;
-    }
-    public void setConfirmDate(Date confirmDate) 
-    {
-        this.confirmDate = confirmDate;
-    }
-
-    public Date getConfirmDate() 
-    {
-        return confirmDate;
-    }
-    public void setAuditingFlag(String auditingFlag) 
-    {
-        this.auditingFlag = auditingFlag;
-    }
-
-    public String getAuditingFlag() 
-    {
-        return auditingFlag;
-    }
-    public void setAuditingMan(String auditingMan) 
-    {
-        this.auditingMan = auditingMan;
-    }
-
-    public String getAuditingMan() 
-    {
-        return auditingMan;
-    }
-    public void setAuditingDate(Date auditingDate) 
-    {
-        this.auditingDate = auditingDate;
-    }
-
-    public Date getAuditingDate() 
-    {
-        return auditingDate;
-    }
-    public void setApproveFlag(String approveFlag) 
-    {
-        this.approveFlag = approveFlag;
-    }
-
-    public String getApproveFlag() 
-    {
-        return approveFlag;
-    }
-    public void setApproveMan(String approveMan) 
-    {
-        this.approveMan = approveMan;
-    }
-
-    public String getApproveMan() 
-    {
-        return approveMan;
-    }
-    public void setSpproveDate(Date spproveDate) 
-    {
-        this.spproveDate = spproveDate;
-    }
-
-    public Date getSpproveDate() 
-    {
-        return spproveDate;
-    }
-    public void setCreateDate(Date createDate) 
-    {
-        this.createDate = createDate;
-    }
-
-    public Date getCreateDate() 
-    {
-        return createDate;
-    }
-    public void setOutsourceOrderNo(String outsourceOrderNo) 
-    {
-        this.outsourceOrderNo = outsourceOrderNo;
-    }
-
-    public String getOutsourceOrderNo() 
-    {
-        return outsourceOrderNo;
-    }
-    public void setGetFlag(String getFlag) 
-    {
-        this.getFlag = getFlag;
-    }
-
-    public String getGetFlag() 
-    {
-        return getFlag;
-    }
-    public void setOrderNo(String orderNo) 
-    {
-        this.orderNo = orderNo;
-    }
-
-    public String getOrderNo() 
-    {
-        return orderNo;
-    }
-    public void setBatchNum(String batchNum) 
-    {
-        this.batchNum = batchNum;
-    }
-
-    public String getBatchNum() 
-    {
-        return batchNum;
-    }
-    public void setSpare1(String spare1) 
-    {
-        this.spare1 = spare1;
-    }
-
-    public String getSpare1() 
-    {
-        return spare1;
-    }
-    public void setSpare2(String spare2) 
-    {
-        this.spare2 = spare2;
-    }
-
-    public String getSpare2() 
-    {
-        return spare2;
-    }
-    public void setSpare3(String spare3) 
-    {
-        this.spare3 = spare3;
-    }
-
-    public String getSpare3() 
-    {
-        return spare3;
-    }
-    public void setSpare4(String spare4) 
-    {
-        this.spare4 = spare4;
-    }
-
-    public String getSpare4() 
-    {
-        return spare4;
-    }
-    public void setSpare5(String spare5) 
-    {
-        this.spare5 = spare5;
-    }
-
-    public String getSpare5() 
-    {
-        return spare5;
-    }
-    public void setSpare6(String spare6) 
-    {
-        this.spare6 = spare6;
-    }
-
-    public String getSpare6() 
-    {
-        return spare6;
-    }
-
-    @Override
-    public String toString() {
-        return "MaterialRequisitionHead{" +
-                "materialRequisitionNo='" + materialRequisitionNo + '\'' +
-                ", workOrderNo='" + workOrderNo + '\'' +
-                ", departmentName='" + departmentName + '\'' +
-                ", linkman='" + linkman + '\'' +
-                ", stockNo='" + stockNo + '\'' +
-                ", stockName='" + stockName + '\'' +
-                ", outputClass='" + outputClass + '\'' +
-                ", outputDate=" + outputDate +
-                ", endFlag='" + endFlag + '\'' +
-                ", itemClass='" + itemClass + '\'' +
-                ", confirmFlag='" + confirmFlag + '\'' +
-                ", confirmMan='" + confirmMan + '\'' +
-                ", confirmDate=" + confirmDate +
-                ", auditingFlag='" + auditingFlag + '\'' +
-                ", auditingMan='" + auditingMan + '\'' +
-                ", auditingDate=" + auditingDate +
-                ", approveFlag='" + approveFlag + '\'' +
-                ", approveMan='" + approveMan + '\'' +
-                ", spproveDate=" + spproveDate +
-                ", createDate=" + createDate +
-                ", outsourceOrderNo='" + outsourceOrderNo + '\'' +
-                ", getFlag='" + getFlag + '\'' +
-                ", orderNo='" + orderNo + '\'' +
-                ", batchNum='" + batchNum + '\'' +
-                ", spare1='" + spare1 + '\'' +
-                ", spare2='" + spare2 + '\'' +
-                ", spare3='" + spare3 + '\'' +
-                ", spare4='" + spare4 + '\'' +
-                ", spare5='" + spare5 + '\'' +
-                ", spare6='" + spare6 + '\'' +
-                ", materialRequisitionLists=" + materialRequisitionLists +
-                '}';
-    }
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/MaterialRequisitionHeadMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/MaterialRequisitionHeadMapper.java
deleted file mode 100644
index b4edf64e..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/produce/mapper/MaterialRequisitionHeadMapper.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.ruoyi.produce.mapper;
-
-import com.ruoyi.produce.domain.MaterialRequisitionHead;
-import com.ruoyi.produce.domain.MaterialRequisitionHeadWithList;
-
-import java.util.List;
-
-/**
- * 领料单Mapper接口
- *
- * @author ruoyi
- * @date 2022-01-06
- */
-public interface MaterialRequisitionHeadMapper {
-    /**
-     * 查询领料单
-     *
-     * @param materialRequisitionNo 领料单ID
-     * @return 领料单
-     */
-    public MaterialRequisitionHead selectMaterialRequisitionHeadById(String materialRequisitionNo);
-
-    /**
-     * 查询领料单列表
-     *
-     * @param materialRequisitionHead 领料单
-     * @return 领料单集合
-     */
-    public List<MaterialRequisitionHead> selectMaterialRequisitionHeadList(MaterialRequisitionHead materialRequisitionHead);
-
-    /**
-     * 新增领料单
-     *
-     * @param materialRequisitionHead 领料单
-     * @return 结果
-     */
-    public int insertMaterialRequisitionHead(MaterialRequisitionHead materialRequisitionHead);
-
-    /**
-     * 修改领料单
-     *
-     * @param materialRequisitionHead 领料单
-     * @return 结果
-     */
-    public int updateMaterialRequisitionHead(MaterialRequisitionHead materialRequisitionHead);
-
-    /**
-     * 删除领料单
-     *
-     * @param materialRequisitionNo 领料单ID
-     * @return 结果
-     */
-    public int deleteMaterialRequisitionHeadById(String materialRequisitionNo);
-
-    /**
-     * 批量删除领料单
-     *
-     * @param materialRequisitionNos 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteMaterialRequisitionHeadByIds(String[] materialRequisitionNos);
-
-    public List<MaterialRequisitionHeadWithList> selectHeadWithList(MaterialRequisitionHeadWithList materialRequisitionHeadWithList);
-
-    public Integer selectCountByDay();
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/IMaterialRequisitionHeadService.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/service/IMaterialRequisitionHeadService.java
deleted file mode 100644
index 79b8e4ae..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/IMaterialRequisitionHeadService.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.ruoyi.produce.service;
-
-import com.ruoyi.produce.domain.MaterialRequisitionHead;
-import com.ruoyi.produce.domain.MaterialRequisitionHeadWithList;
-
-import java.util.List;
-
-/**
- * 领料单Service接口
- * 
- * @author ruoyi
- * @date 2022-01-06
- */
-public interface IMaterialRequisitionHeadService 
-{
-    /**
-     * 查询领料单
-     * 
-     * @param materialRequisitionNo 领料单ID
-     * @return 领料单
-     */
-    public MaterialRequisitionHead selectMaterialRequisitionHeadById(String materialRequisitionNo);
-
-    /**
-     * 查询领料单列表
-     * 
-     * @param materialRequisitionHead 领料单
-     * @return 领料单集合
-     */
-    public List<MaterialRequisitionHead> selectMaterialRequisitionHeadList(MaterialRequisitionHead materialRequisitionHead);
-
-    /**
-     * 新增领料单
-     * 
-     * @param materialRequisitionHead 领料单
-     * @return 结果
-     */
-    public int insertMaterialRequisitionHead(MaterialRequisitionHead materialRequisitionHead);
-
-    /**
-     * 修改领料单
-     * 
-     * @param materialRequisitionHead 领料单
-     * @return 结果
-     */
-    public int updateMaterialRequisitionHead(MaterialRequisitionHead materialRequisitionHead);
-
-    /**
-     * 批量删除领料单
-     * 
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    public int deleteMaterialRequisitionHeadByIds(String ids);
-
-    /**
-     * 删除领料单信息
-     * 
-     * @param materialRequisitionNo 领料单ID
-     * @return 结果
-     */
-    public int deleteMaterialRequisitionHeadById(String materialRequisitionNo);
-
-    public List<MaterialRequisitionHeadWithList> selectHeadWithList(MaterialRequisitionHeadWithList materialRequisitionHeadWithList);
-
-    public String getId();
-
-}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/MaterialRequisitionHeadServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/MaterialRequisitionHeadServiceImpl.java
deleted file mode 100644
index 0f224e4e..00000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/produce/service/impl/MaterialRequisitionHeadServiceImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.ruoyi.produce.service.impl;
-
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.produce.domain.MaterialRequisitionHead;
-import com.ruoyi.produce.domain.MaterialRequisitionHeadWithList;
-import com.ruoyi.produce.domain.MaterialRequisitionList;
-import com.ruoyi.produce.mapper.MaterialRequisitionHeadMapper;
-import com.ruoyi.produce.mapper.MaterialRequisitionListMapper;
-import com.ruoyi.produce.service.IMaterialRequisitionHeadService;
-import com.ruoyi.stock.domain.StockInfo;
-import com.ruoyi.stock.mapper.StockInfoMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDate;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 领料单Service业务层处理
- *
- * @author ruoyi
- * @date 2022-01-06
- */
-@Service
-public class MaterialRequisitionHeadServiceImpl implements IMaterialRequisitionHeadService {
-    @Autowired
-    private MaterialRequisitionHeadMapper materialRequisitionHeadMapper;
-
-    @Autowired
-    private MaterialRequisitionListMapper materialRequisitionListMapper;
-
-    @Autowired
-    private StockInfoMapper stockInfoMapper;
-
-    /**
-     * 查询领料单
-     *
-     * @param materialRequisitionNo 领料单ID
-     * @return 领料单
-     */
-    @Override
-    public MaterialRequisitionHead selectMaterialRequisitionHeadById(String materialRequisitionNo) {
-        return materialRequisitionHeadMapper.selectMaterialRequisitionHeadById(materialRequisitionNo);
-    }
-
-    /**
-     * 查询领料单列表
-     *
-     * @param materialRequisitionHead 领料单
-     * @return 领料单
-     */
-    @Override
-    public List<MaterialRequisitionHead> selectMaterialRequisitionHeadList(MaterialRequisitionHead materialRequisitionHead) {
-        return materialRequisitionHeadMapper.selectMaterialRequisitionHeadList(materialRequisitionHead);
-    }
-
-    /**
-     * 新增领料单
-     *
-     * @param materialRequisitionHead 领料单
-     * @return 结果
-     */
-    @Override
-    public int insertMaterialRequisitionHead(MaterialRequisitionHead materialRequisitionHead) {
-        List<MaterialRequisitionList> list = materialRequisitionHead.getMaterialRequisitionLists();
-        String no = materialRequisitionHead.getMaterialRequisitionNo();
-        for (int i = 0; i < list.size(); i++) {
-            MaterialRequisitionList each = list.get(i);
-            each.setBatchNum(i + 1 + "");
-            each.setMaterialRequisitionNo(no);
-            materialRequisitionListMapper.insertMaterialRequisitionList(each);
-        }
-        materialRequisitionHead.setOutputDate(new Date());
-        materialRequisitionHead.setEndFlag("0");
-        materialRequisitionHead.setGetFlag("0");
-        StockInfo stockInfo = new StockInfo();
-        stockInfo.setStockName(materialRequisitionHead.getStockName());
-        stockInfo = stockInfoMapper.selectStockInfoList(stockInfo).get(0);
-        materialRequisitionHead.setStockNo(stockInfo.getStockNO());
-        return materialRequisitionHeadMapper.insertMaterialRequisitionHead(materialRequisitionHead);
-    }
-
-    /**
-     * 修改领料单
-     *
-     * @param materialRequisitionHead 领料单
-     * @return 结果
-     */
-    @Override
-    public int updateMaterialRequisitionHead(MaterialRequisitionHead materialRequisitionHead) {
-        String no = materialRequisitionHead.getMaterialRequisitionNo();
-        materialRequisitionListMapper.deleteMaterialRequisitionListById(no);
-        List<MaterialRequisitionList> list = materialRequisitionHead.getMaterialRequisitionLists();
-        for (int i = 0; i < list.size(); i++) {
-            MaterialRequisitionList each = list.get(i);
-            each.setBatchNum(i + 1 + "");
-            each.setMaterialRequisitionNo(no);
-            materialRequisitionListMapper.insertMaterialRequisitionList(each);
-        }
-        StockInfo stockInfo = new StockInfo();
-        stockInfo.setStockName(materialRequisitionHead.getStockName());
-        stockInfo = stockInfoMapper.selectStockInfoList(stockInfo).get(0);
-        materialRequisitionHead.setStockNo(stockInfo.getStockNO());
-        return materialRequisitionHeadMapper.updateMaterialRequisitionHead(materialRequisitionHead);
-    }
-
-    /**
-     * 删除领料单对象
-     *
-     * @param ids 需要删除的数据ID
-     * @return 结果
-     */
-    @Override
-    public int deleteMaterialRequisitionHeadByIds(String ids) {
-        return materialRequisitionHeadMapper.deleteMaterialRequisitionHeadByIds(Convert.toStrArray(ids));
-    }
-
-    /**
-     * 删除领料单信息
-     *
-     * @param materialRequisitionNo 领料单ID
-     * @return 结果
-     */
-    @Override
-    public int deleteMaterialRequisitionHeadById(String materialRequisitionNo) {
-        return materialRequisitionHeadMapper.deleteMaterialRequisitionHeadById(materialRequisitionNo);
-    }
-
-    @Override
-    public List<MaterialRequisitionHeadWithList> selectHeadWithList(MaterialRequisitionHeadWithList materialRequisitionHeadWithList) {
-        return materialRequisitionHeadMapper.selectHeadWithList(materialRequisitionHeadWithList);
-    }
-
-    @Override
-    public String getId() {
-        int count = materialRequisitionHeadMapper.selectCountByDay() + 1;
-        LocalDate now = LocalDate.now();
-        String s = now.toString().replaceAll("-", "");
-        String id = "WLLL" + s;
-        if (count >= 100) {
-            id += count;
-        } else if (count >= 10) {
-            id += "0" + count;
-        } else {
-            id += "00" + count;
-        }
-        return id;
-    }
-}
diff --git a/ruoyi-admin/src/main/resources/mapper/produce/MaterialRequisitionHeadMapper.xml b/ruoyi-admin/src/main/resources/mapper/produce/MaterialRequisitionHeadMapper.xml
deleted file mode 100644
index 339165bb..00000000
--- a/ruoyi-admin/src/main/resources/mapper/produce/MaterialRequisitionHeadMapper.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?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.ruoyi.produce.mapper.MaterialRequisitionHeadMapper">
-    
-    <resultMap type="MaterialRequisitionHead" id="MaterialRequisitionHeadResult">
-        <result property="materialRequisitionNo"    column="materialRequisitionNo"    />
-        <result property="workOrderNo"    column="workOrderNo"    />
-        <result property="departmentName"    column="departmentName"    />
-        <result property="linkman"    column="linkman"    />
-        <result property="stockNo"    column="stockNo"    />
-        <result property="stockName"    column="stockName"    />
-        <result property="outputClass"    column="outputClass"    />
-        <result property="outputDate"    column="outputDate"    />
-        <result property="remark"    column="remark"    />
-        <result property="endFlag"    column="endFlag"    />
-        <result property="itemClass"    column="itemClass"    />
-        <result property="confirmFlag"    column="confirmFlag"    />
-        <result property="confirmMan"    column="confirmMan"    />
-        <result property="confirmDate"    column="confirmDate"    />
-        <result property="auditingFlag"    column="auditingFlag"    />
-        <result property="auditingMan"    column="auditingMan"    />
-        <result property="auditingDate"    column="auditingDate"    />
-        <result property="approveFlag"    column="approveFlag"    />
-        <result property="approveMan"    column="approveMan"    />
-        <result property="spproveDate"    column="spproveDate"    />
-        <result property="createDate"    column="createDate"    />
-        <result property="outsourceOrderNo"    column="outsourceOrderNo"    />
-        <result property="getFlag"    column="getFlag"    />
-        <result property="orderNo"    column="orderNo"    />
-        <result property="batchNum"    column="batchNum"    />
-        <result property="spare1"    column="spare1"    />
-        <result property="spare2"    column="spare2"    />
-        <result property="spare3"    column="spare3"    />
-        <result property="spare4"    column="spare4"    />
-        <result property="spare5"    column="spare5"    />
-        <result property="spare6"    column="spare6"    />
-    </resultMap>
-
-    <sql id="selectMaterialRequisitionHeadVo">
-        select materialRequisitionNo, workOrderNo, departmentName, linkman, stockNo, stockName, outputClass, outputDate, remark, endFlag, itemClass, confirmFlag, confirmMan, confirmDate, auditingFlag, auditingMan, auditingDate, approveFlag, approveMan, spproveDate, createDate, outsourceOrderNo, getFlag, orderNo, batchNum, spare1, spare2, spare3, spare4, spare5, spare6 from material_requisition_head
-    </sql>
-
-    <select id="selectMaterialRequisitionHeadList" parameterType="MaterialRequisitionHead" resultMap="MaterialRequisitionHeadResult">
-        <include refid="selectMaterialRequisitionHeadVo"/>
-        <where>  
-            <if test="materialRequisitionNo != null  and materialRequisitionNo != ''"> and materialRequisitionNo like concat('%', #{materialRequisitionNo}, '%')</if>
-            <if test="workOrderNo != null  and workOrderNo != ''"> and workOrderNo like concat('%', #{workOrderNo}, '%')</if>
-            <if test="departmentName != null  and departmentName != ''"> and departmentName like concat('%', #{departmentName}, '%')</if>
-            <if test="linkman != null  and linkman != ''"> and linkman like concat('%', #{linkman}, '%')</if>
-            <if test="stockNo != null  and stockNo != ''"> and stockNo like concat('%', #{stockNo}, '%')</if>
-            <if test="stockName != null  and stockName != ''"> and stockName like concat('%', #{stockName}, '%')</if>
-            <if test="outputClass != null  and outputClass != ''"> and outputClass = #{outputClass}</if>
-            <if test="params.beginOutputDate != null and params.beginOutputDate != '' and params.endOutputDate != null and params.endOutputDate != ''"> and outputDate between #{params.beginOutputDate} and #{params.endOutputDate}</if>
-            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
-            <if test="endFlag != null  and endFlag != ''"> and endFlag = #{endFlag}</if>
-            <if test="itemClass != null  and itemClass != ''"> and itemClass = #{itemClass}</if>
-            <if test="confirmFlag != null  and confirmFlag != ''"> and confirmFlag = #{confirmFlag}</if>
-            <if test="confirmMan != null  and confirmMan != ''"> and confirmMan like concat('%', #{confirmMan}, '%')</if>
-            <if test="params.beginConfirmDate != null and params.beginConfirmDate != '' and params.endConfirmDate != null and params.endConfirmDate != ''"> and confirmDate between #{params.beginConfirmDate} and #{params.endConfirmDate}</if>
-            <if test="auditingFlag != null  and auditingFlag != ''"> and auditingFlag = #{auditingFlag}</if>
-            <if test="auditingMan != null  and auditingMan != ''"> and auditingMan like concat('%', #{auditingMan}, '%')</if>
-            <if test="params.beginAuditingDate != null and params.beginAuditingDate != '' and params.endAuditingDate != null and params.endAuditingDate != ''"> and auditingDate between #{params.beginAuditingDate} and #{params.endAuditingDate}</if>
-            <if test="approveFlag != null  and approveFlag != ''"> and approveFlag = #{approveFlag}</if>
-            <if test="approveMan != null  and approveMan != ''"> and approveMan like concat('%', #{approveMan}, '%')</if>
-            <if test="params.beginSpproveDate != null and params.beginSpproveDate != '' and params.endSpproveDate != null and params.endSpproveDate != ''"> and spproveDate between #{params.beginSpproveDate} and #{params.endSpproveDate}</if>
-            <if test="params.beginCreateDate != null and params.beginCreateDate != '' and params.endCreateDate != null and params.endCreateDate != ''"> and createDate between #{params.beginCreateDate} and #{params.endCreateDate}</if>
-            <if test="outsourceOrderNo != null  and outsourceOrderNo != ''"> and outsourceOrderNo like concat('%', #{outsourceOrderNo}, '%')</if>
-            <if test="getFlag != null  and getFlag != ''"> and getFlag = #{getFlag}</if>
-            <if test="orderNo != null  and orderNo != ''"> and orderNo like concat('%', #{orderNo}, '%')</if>
-            <if test="batchNum != null  and batchNum != ''"> and batchNum like concat('%', #{batchNum}, '%')</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
-            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
-        </where>
-    </select>
-    
-    <select id="selectMaterialRequisitionHeadById" parameterType="String" resultMap="MaterialRequisitionHeadResult">
-        <include refid="selectMaterialRequisitionHeadVo"/>
-        where materialRequisitionNo = #{materialRequisitionNo}
-    </select>
-        
-    <insert id="insertMaterialRequisitionHead" parameterType="MaterialRequisitionHead">
-        insert into material_requisition_head
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="materialRequisitionNo != null and materialRequisitionNo != ''">materialRequisitionNo,</if>
-            <if test="workOrderNo != null">workOrderNo,</if>
-            <if test="departmentName != null">departmentName,</if>
-            <if test="linkman != null">linkman,</if>
-            <if test="stockNo != null">stockNo,</if>
-            <if test="stockName != null">stockName,</if>
-            <if test="outputClass != null and outputClass != ''">outputClass,</if>
-            <if test="outputDate != null">outputDate,</if>
-            <if test="remark != null">remark,</if>
-            <if test="endFlag != null">endFlag,</if>
-            <if test="itemClass != null">itemClass,</if>
-            <if test="confirmFlag != null">confirmFlag,</if>
-            <if test="confirmMan != null">confirmMan,</if>
-            <if test="confirmDate != null">confirmDate,</if>
-            <if test="auditingFlag != null">auditingFlag,</if>
-            <if test="auditingMan != null">auditingMan,</if>
-            <if test="auditingDate != null">auditingDate,</if>
-            <if test="approveFlag != null">approveFlag,</if>
-            <if test="approveMan != null">approveMan,</if>
-            <if test="spproveDate != null">spproveDate,</if>
-            <if test="createDate != null">createDate,</if>
-            <if test="outsourceOrderNo != null">outsourceOrderNo,</if>
-            <if test="getFlag != null">getFlag,</if>
-            <if test="orderNo != null">orderNo,</if>
-            <if test="batchNum != null">batchNum,</if>
-            <if test="spare1 != null">spare1,</if>
-            <if test="spare2 != null">spare2,</if>
-            <if test="spare3 != null">spare3,</if>
-            <if test="spare4 != null">spare4,</if>
-            <if test="spare5 != null">spare5,</if>
-            <if test="spare6 != null">spare6,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="materialRequisitionNo != null and materialRequisitionNo != ''">#{materialRequisitionNo},</if>
-            <if test="workOrderNo != null">#{workOrderNo},</if>
-            <if test="departmentName != null">#{departmentName},</if>
-            <if test="linkman != null">#{linkman},</if>
-            <if test="stockNo != null">#{stockNo},</if>
-            <if test="stockName != null">#{stockName},</if>
-            <if test="outputClass != null and outputClass != ''">#{outputClass},</if>
-            <if test="outputDate != null">#{outputDate},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="endFlag != null">#{endFlag},</if>
-            <if test="itemClass != null">#{itemClass},</if>
-            <if test="confirmFlag != null">#{confirmFlag},</if>
-            <if test="confirmMan != null">#{confirmMan},</if>
-            <if test="confirmDate != null">#{confirmDate},</if>
-            <if test="auditingFlag != null">#{auditingFlag},</if>
-            <if test="auditingMan != null">#{auditingMan},</if>
-            <if test="auditingDate != null">#{auditingDate},</if>
-            <if test="approveFlag != null">#{approveFlag},</if>
-            <if test="approveMan != null">#{approveMan},</if>
-            <if test="spproveDate != null">#{spproveDate},</if>
-            <if test="createDate != null">#{createDate},</if>
-            <if test="outsourceOrderNo != null">#{outsourceOrderNo},</if>
-            <if test="getFlag != null">#{getFlag},</if>
-            <if test="orderNo != null">#{orderNo},</if>
-            <if test="batchNum != null">#{batchNum},</if>
-            <if test="spare1 != null">#{spare1},</if>
-            <if test="spare2 != null">#{spare2},</if>
-            <if test="spare3 != null">#{spare3},</if>
-            <if test="spare4 != null">#{spare4},</if>
-            <if test="spare5 != null">#{spare5},</if>
-            <if test="spare6 != null">#{spare6},</if>
-         </trim>
-    </insert>
-
-    <update id="updateMaterialRequisitionHead" parameterType="MaterialRequisitionHead">
-        update material_requisition_head
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="workOrderNo != null">workOrderNo = #{workOrderNo},</if>
-            <if test="departmentName != null">departmentName = #{departmentName},</if>
-            <if test="linkman != null">linkman = #{linkman},</if>
-            <if test="stockNo != null">stockNo = #{stockNo},</if>
-            <if test="stockName != null">stockName = #{stockName},</if>
-            <if test="outputClass != null and outputClass != ''">outputClass = #{outputClass},</if>
-            <if test="outputDate != null">outputDate = #{outputDate},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="endFlag != null">endFlag = #{endFlag},</if>
-            <if test="itemClass != null">itemClass = #{itemClass},</if>
-            <if test="confirmFlag != null">confirmFlag = #{confirmFlag},</if>
-            <if test="confirmMan != null">confirmMan = #{confirmMan},</if>
-            <if test="confirmDate != null">confirmDate = #{confirmDate},</if>
-            <if test="auditingFlag != null">auditingFlag = #{auditingFlag},</if>
-            <if test="auditingMan != null">auditingMan = #{auditingMan},</if>
-            <if test="auditingDate != null">auditingDate = #{auditingDate},</if>
-            <if test="approveFlag != null">approveFlag = #{approveFlag},</if>
-            <if test="approveMan != null">approveMan = #{approveMan},</if>
-            <if test="spproveDate != null">spproveDate = #{spproveDate},</if>
-            <if test="createDate != null">createDate = #{createDate},</if>
-            <if test="outsourceOrderNo != null">outsourceOrderNo = #{outsourceOrderNo},</if>
-            <if test="getFlag != null">getFlag = #{getFlag},</if>
-            <if test="orderNo != null">orderNo = #{orderNo},</if>
-            <if test="batchNum != null">batchNum = #{batchNum},</if>
-            <if test="spare1 != null">spare1 = #{spare1},</if>
-            <if test="spare2 != null">spare2 = #{spare2},</if>
-            <if test="spare3 != null">spare3 = #{spare3},</if>
-            <if test="spare4 != null">spare4 = #{spare4},</if>
-            <if test="spare5 != null">spare5 = #{spare5},</if>
-            <if test="spare6 != null">spare6 = #{spare6},</if>
-        </trim>
-        where materialRequisitionNo = #{materialRequisitionNo}
-    </update>
-
-    <delete id="deleteMaterialRequisitionHeadById" parameterType="String">
-        delete from material_requisition_head where materialRequisitionNo = #{materialRequisitionNo}
-    </delete>
-
-    <delete id="deleteMaterialRequisitionHeadByIds" parameterType="String">
-        delete from material_requisition_head where materialRequisitionNo in 
-        <foreach item="materialRequisitionNo" collection="array" open="(" separator="," close=")">
-            #{materialRequisitionNo}
-        </foreach>
-    </delete>
-
-    <select id="selectCountByDay" resultType="Integer">
-        select count(*) from material_requisition_head where to_days(outputDate) = to_days(now());
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionHead/add.html b/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionHead/add.html
deleted file mode 100644
index e6e55869..00000000
--- a/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionHead/add.html
+++ /dev/null
@@ -1,1224 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <th:block th:include="include :: header('新增领料单')"/>
-    <th:block th:include="include :: datetimepicker-css"/>
-    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
-    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
-</head>
-<body class="white-bg">
-<div class="container-div">
-    <div class="row">
-        <div class="col-sm-12">
-
-        </div>
-        <form class="form-horizontal m" id="form-materialRequisitionHead-add">
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">领料单号：</label>
-                <div class="col-sm-8">
-                    <input name="materialRequisitionNo" class="form-control" type="text" required readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">制工单号：</label>
-                <div class="col-sm-8">
-                    <input name="workOrderNo" class="form-control" type="text" readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">委外单号：</label>
-                <div class="col-sm-8">
-                    <input name="outsourceOrderNo" class="form-control" type="text" readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">部门名称：</label>
-                <div class="col-sm-8">
-                    <select name="departmentName" class="form-control m-b"
-                            th:with="type=${@dict.getType('sys_dept_type')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">领料人：</label>
-                <div class="col-sm-8">
-                    <input name="linkman" class="form-control" type="text">
-                </div>
-            </div>
-            <!--        <div class="form-group">-->
-            <!--            <label class="col-sm-3 control-label">仓库号：</label>-->
-            <!--            <div class="col-sm-8">-->
-            <!--                <select name="stockNo" class="form-control m-b">-->
-            <!--                </select>-->
-            <!--            </div>-->
-            <!--        </div>-->
-            <div class="form-group">
-                <label class="col-sm-3 control-label">仓库名称：</label>
-                <div class="col-sm-8">
-                    <select name="stockName" class="form-control m-b">
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">出库类型：</label>
-                <div class="col-sm-8">
-                    <select name="outputClass" class="form-control m-b" required
-                            th:with="type=${@dict.getType('sys_out_type')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">领料日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="outputDate" class="form-control time-input" placeholder="yyyy-MM-dd" type="text"
-                               required disabled>
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">订单号：</label>
-                <div class="col-sm-8">
-                    <input name="orderNo" class="form-control" type="text" readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">成品代码：</label>
-                <div class="col-sm-8">
-                    <input name="finishedCode" class="form-control" type="text" readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">工单数量：</label>
-                <div class="col-sm-8">
-                    <input name="orderQty" class="form-control" type="text" readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="remark" class="form-control" type="text">
-                </div>
-            </div>
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">结案否：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <select name="endFlag" class="form-control m-b">-->
-            <!--                        <option value="">所有</option>-->
-            <!--                    </select>-->
-            <!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">物料类别：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <select name="itemClass" class="form-control m-b">-->
-            <!--                        <option value="">所有</option>-->
-            <!--                    </select>-->
-            <!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">确认否：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <select name="confirmFlag" class="form-control m-b">-->
-            <!--                        <option value="">所有</option>-->
-            <!--                    </select>-->
-            <!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">确认人：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <input name="confirmMan" class="form-control" type="text">-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">确认时间：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <div class="input-group date">-->
-            <!--                        <input name="confirmDate" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-            <!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-            <!--                    </div>-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">审核否：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <select name="auditingFlag" class="form-control m-b">-->
-            <!--                        <option value="">所有</option>-->
-            <!--                    </select>-->
-            <!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">审核人：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <input name="auditingMan" class="form-control" type="text">-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">审核日期：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <div class="input-group date">-->
-            <!--                        <input name="auditingDate" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-            <!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-            <!--                    </div>-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">核准否：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <select name="approveFlag" class="form-control m-b">-->
-            <!--                        <option value="">所有</option>-->
-            <!--                    </select>-->
-            <!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">核准人：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <input name="approveMan" class="form-control" type="text">-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">核准日期：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <div class="input-group date">-->
-            <!--                        <input name="spproveDate" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-            <!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-            <!--                    </div>-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">开单日期：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <div class="input-group date">-->
-            <!--                        <input name="createDate" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-            <!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-            <!--                    </div>-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">领料否：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <select name="getFlag" class="form-control m-b">-->
-            <!--                        <option value="">所有</option>-->
-            <!--                    </select>-->
-            <!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">生产批号：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <input name="batchNum" class="form-control" type="text">-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <input name="spare1" class="form-control" type="text">-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <input name="spare2" class="form-control" type="text">-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <input name="spare3" class="form-control" type="text">-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <input name="spare4" class="form-control" type="text">-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <input name="spare5" class="form-control" type="text">-->
-            <!--                </div>-->
-            <!--            </div>-->
-            <!--            <div class="form-group">    -->
-            <!--                <label class="col-sm-3 control-label">：</label>-->
-            <!--                <div class="col-sm-8">-->
-            <!--                    <input name="spare6" class="form-control" type="text">-->
-            <!--                </div>-->
-            <!--            </div>-->
-        </form>
-
-        <div class="col-sm-12">
-            <label>物料代码：</label>
-            <input type="text" name="wlCode" id="wlCode" class="form-control" placeholder="请输入物料代码"
-                   style="margin-bottom: 15px">
-            <button type="button" class="btn btn-success" id="itemTableSearch">搜索</button>
-            <button type="button" class="btn btn-success" onclick="itemTableReset()">重置</button>
-            <div class="col-sm-12 select-table table-striped" style="padding-bottom: 100px;">
-                <table id="bootstrap-table"></table>
-            </div>
-        </div>
-        <div class="col-sm-12" style="text-align: center">
-            <button type="button" class="btn btn-success" style="margin-top: 20px"
-                    onclick="addItem()">确定
-            </button>
-        </div>
-        <div class="col-sm-12 select-table table-striped" style="padding-bottom: 100px;">
-            <table id="selectItemTable"></table>
-            <!--            <button type="button" onclick="commit()" class="btn btn-primary"-->
-            <!--                    style="margin-top: 30px;margin-left: 620px;">提交-->
-            <!--            </button>-->
-            <!--            <button onclick="close()" class="btn btn-danger" type="button" style="margin-top: 30px;margin-left: 200px">-->
-            <!--                关闭-->
-            <!--            </button>-->
-        </div>
-
-        <div class="modal inmodal" id="workOrderModal" tabindex="-1"
-             role="dilog" aria-hidden="true">
-            <div class="modal-dialog" style="width: 800px;height: 600px;">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"
-                                aria-hidden="true"></button>
-                        <h4 class="modal-title">选择制工单</h4>
-                    </div>
-                    <div class="modal-body" style="text-align: center;">
-                        <div class="row" style="margin-bottom: 20px;">
-                            <div class="col-md-5">
-                                <form id="workOrderForm">
-                                    <div class="form-group">
-                                        <label class="control-label col-md-4">制工单号：</label>
-                                        <div class="col-md-8">
-                                            <input type="text" class="form-control"
-                                                   id="poId">
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
-                            <div class="col-md-2">
-                                <button type="button" class="btn btn-success" id="poIdSearch">搜索</button>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="table-responsive">
-                                    <table id="workOrderTable"
-                                           class="table table-striped table-responsive">
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary"
-                                onClick="selectWorkOrder();">选择
-                        </button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal" name="close">关闭</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="modal inmodal" id="outsourceModal" tabindex="-1"
-             role="dilog" aria-hidden="true">
-            <div class="modal-dialog" style="width: 800px;height: 600px;">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"
-                                aria-hidden="true"></button>
-                        <h4 class="modal-title">选择委外单</h4>
-                    </div>
-                    <div class="modal-body" style="text-align: center;">
-                        <div class="row" style="margin-bottom: 20px;">
-                            <div class="col-md-5">
-                                <form id="outsourceFrom">
-                                    <input type="text" class="form-control"
-                                           name="endFlag" value="0" style="display: none">
-                                    <div class="form-group">
-                                        <label class="control-label col-md-4">委外单号：</label>
-                                        <div class="col-md-8">
-                                            <input type="text" class="form-control"
-                                                   id="outsourceOrderNo">
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
-                            <div class="col-md-2">
-                                <button type="button" class="btn btn-success" id="outsourceSearch">搜索</button>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="table-responsive">
-                                    <table id="outsourceTable"
-                                           class="table table-striped table-responsive">
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary"
-                                onClick="selectOutsource();">选择
-                        </button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal" name="close">关闭</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-</div>
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: datetimepicker-js"/>
-<th:block th:include="include :: bootstrap-table-editable-js"/>
-<script th:src="@{/ajax/libs/select2/select2.js}"></script>
-<script th:inline="javascript">
-    var prefix = ctx + "produce/materialRequisitionHead"
-    $("#form-materialRequisitionHead-add").validate({
-        focusCleanup: true
-    });
-
-    function submitHandler() {
-        // if ($.validate.form()) {
-        //     $.operate.save(prefix + "/add", $('#form-materialRequisitionHead-add').serialize());
-        // }
-        submit();
-    }
-
-    let today = new Date();
-    today.setTime(today.getTime());
-    let time = today.getFullYear() + "-" + (today.getMonth() + 1) + "-" + today.getDate();
-    $("input[name='outputDate']").val(time);
-
-    //鼠标移入，显示完整的数据
-    function paramsMatter(value, row, index) {
-        var span = document.createElement("span");
-        span.setAttribute("title", value);
-        span.innerHTML = value;
-        return span.outerHTML;
-    }
-
-    $("input[name='workOrderNo']").on("click", function () {
-        $("#workOrderModal").modal("show");
-    })
-
-    $("input[name='outsourceOrderNo']").on("click", function () {
-        $("#outsourceModal").modal("show");
-    })
-
-    //获取单号
-    $.ajax({
-        url: prefix + "/id",
-        type: "post",
-        dateType: "json",
-        success: function (resp) {
-            if (resp.code === 0) {
-                $("input[name='materialRequisitionNo']").val(resp.data);
-            } else {
-                $.modal.msgError("失败啦");
-            }
-        },
-        error: function () {
-            $.modal.msgError("后台出错啦！");
-        }
-    });
-
-    //获取仓库名
-    $.ajax({
-        url: ctx + "stock/stockInfo/all",
-        type: "post",
-        dataType: "json",
-        success: function (resp) {
-            if (resp.code === 0) {
-                let data = resp.data;
-                //alert(JSON.stringify(data));
-                for (let i in data) {
-                    $("select[name='stockName']").append("<option value='" + data[i].stockname + "'>" + data[i].stockname + "</option>");
-                }
-            } else {
-                $.modal.msgError(resp.msg);
-            }
-        },
-        error: function () {
-            $.modal.msgError("后台出错啦！");
-        }
-    })
-
-    //全部库存
-    $('#bootstrap-table').bootstrapTable({
-        url: ctx + "ck/itemCP/itemList",
-        method: 'post',
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        pagination: true, // 是否显示分页（*）
-        contentType: "application/x-www-form-urlencoded",
-        queryParams: function (params) {
-            var curParams = {
-                // 传递参数查询参数
-                pageSize: params.limit,
-                pageNum: params.offset / params.limit + 1
-                // searchValue:    params.search,
-                // orderByColumn:  params.sort,
-                // isAsc:          params.order
-            };
-            var wlCode = $("#wlCode").val();
-            //alert(wlCode);
-            var json = $.extend(curParams, {"wlCode": wlCode});
-            return json;
-        },
-        sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
-        pageNumber: 1, // 初始化加载第一页，默认第一页
-        pageSize: 5, // 每页的记录行数（*）
-        pageList: [5, 10, 50], // 可供选择的每页的行数（*）
-        clickToSelect: true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        // singleSelect : true,
-        height: 350,
-        columns: [{
-            checkbox: true
-        },
-            {
-                field: 'wlCode',
-                title: '物料代码',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemname',
-                title: '物料名称',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemstandard',
-                title: '规格',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'machineNo',
-                title: '机种'
-            },
-            {
-                field: 'stockDw',
-                title: '单位'
-            },
-            {
-                field: 'pWldm',
-                title: '客户料号'
-            },
-            {
-                field: 'itemClass',
-                title: '物料类别'
-            }
-        ]
-    });
-
-    //准备提交的item
-    $('#selectItemTable').bootstrapTable({
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        // contentType :"application/x-www-form-urlencoded",
-        // pageNumber : 1, // 初始化加载第一页，默认第一页
-        // pageSize : 10, // 每页的记录行数（*）
-        // pageList : [ 5, 10,50], // 可供选择的每页的行数（*）
-        // clickToSelect : true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        singleSelect: true,
-        height: 400,
-        uniqueId: 'itemCode',
-        // onEditableSave: function (field, row, oldValue, $el) {
-        //     if (row.qty > 0 && row.price > 0) {
-        //         row.totalPrice = row.qty * row.price;
-        //     }
-        // },
-        columns: [{
-            checkbox: false
-        },
-            {
-                field: 'itemCode',
-                title: '物料代码',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemName',
-                title: '物料名称',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemSpecification',
-                title: '规格型号',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'unit',
-                title: '单位'
-            },
-            {
-                field: 'spare1',
-                title: '物料类别'
-            },
-            {
-                field: 'spare2',
-                title: '使用量',
-                editable: {
-                    type: 'text',
-                    title: '数量',
-                    emptytext: "0",
-                    validate: function (value) {
-                        if (parseInt(value) < 0) {
-                            return '数量不能小于0！';
-                        }
-                        if (isNaN(value)) {
-                            return '数量必须是数字！';
-                        }
-                    }
-                }
-            },
-            {
-                field: 'planQty',
-                title: '计划数量',
-                editable: {
-                    type: 'text',
-                    title: '数量',
-                    emptytext: "0",
-                    validate: function (value) {
-                        if (parseInt(value) < 0) {
-                            return '数量不能小于0！';
-                        }
-                        if (isNaN(value)) {
-                            return '数量必须是数字！';
-                        }
-                    }
-                }
-            },
-            {
-                field: 'remark',
-                title: '备注',
-                editable: {
-                    type: 'text',
-                    title: '说明',
-                    emptytext: ""
-                }
-            },
-            {
-                title: '操作',
-                align: 'center',
-                formatter: function (value, row, index) {
-                    var actions = [];
-                    actions.push('<a class="btn btn-danger btn-xs ' + '" href="javascript:void(0)" onclick="remove(\'' + row.itemCode + '\')"><i class="fa fa-remove"></i>删除</a>');
-                    return actions.join('');
-                }
-            }
-        ]
-    });
-
-    //item表格重置
-    function itemTableReset() {
-        $("input[name='wlCode']").val("");
-        $("#bootstrap-table").bootstrapTable("refresh");
-    }
-
-    //搜索item表格
-    $("#itemTableSearch").on("click", function () {
-        $("#bootstrap-table").bootstrapTable("refresh");
-    })
-
-    //将选中的bom引入待确认bom表格
-    function addItem() {
-        let row = $("#bootstrap-table").bootstrapTable("getSelections");
-        let count = $('#selectItemTable').bootstrapTable('getData').length;
-        for (let i = 0; i < row.length; i++) {
-            let bootstrapTable = $("#selectItemTable").bootstrapTable("getRowByUniqueId", row[i].wlCode);
-            //alert(bootstrapTable);
-            if (bootstrapTable != null) {
-                alert("物料代码" + row[i].wlCode + "已存在!");
-                continue;
-            }
-            $("#selectItemTable").bootstrapTable('insertRow', {
-                index: count + i,
-                row: {
-                    itemCode: row[i].wlCode,
-                    itemName: row[i].itemname,
-                    itemSpecification: row[i].itemstandard,
-                    unit: row[i].stockDw,
-                    spare1: row[i].itemClass,
-                    planQty: 0,
-                    spare2: 0
-                }
-            });
-        }
-        itemTableReset();
-    }
-
-    function remove(itemCode) {
-        $("#selectItemTable").bootstrapTable("remove", {
-            field: 'itemCode',
-            values: itemCode
-        });
-    }
-
-    //提交
-    function submit() {
-        let bootstrapTable = $("#selectItemTable").bootstrapTable("getData", true);
-        let formData = new FormData($("#form-materialRequisitionHead-add")[0]);
-        formData.append("materialRequisitionLists", JSON.stringify(bootstrapTable));
-        let data1 = {};
-        formData.forEach((value, key) => data1[key] = value);
-        //alert(JSON.stringify(data1));
-        $.ajax({
-            url: prefix + "/add",
-            type: "post",
-            resultType: "json",
-            data: {"jsonStr": JSON.stringify(data1)},
-            success: function (resp) {
-                if (resp.code === 0) {
-                    alert("添加成功！");
-                    // window.location.href = prefix;
-                    var index = parent.layer.getFrameIndex(window.name);
-                    var parent2 = window.parent;
-                    parent2.$.table.refresh();
-                    parent.layer.close(index);//关闭当前页
-                } else {
-                    $.modal.msgError(resp.msg);
-                }
-            },
-            error: function () {
-                $.modal.msgError("出错了！");
-            }
-        });
-    }
-
-    //选择制工单列表
-    $('#workOrderTable').bootstrapTable({
-        url: '/produce/workorderhead/list',
-        pagination: true,
-        pageNumber: 1,
-        pageSize: 10,
-        pageList: [10, 25, 50, 100],
-        showRefresh: true,
-        method: "post",
-        contentType: "application/x-www-form-urlencoded",
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
-        clickToSelect: true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        singleSelect: true,
-        height: 400,
-        queryParams: function (params) {
-            //console.log("123");
-            var curParams = {
-                // 传递参数查询参数
-                pageSize: params.limit,
-                pageNum: params.offset / params.limit + 1,
-                searchValue: params.search,
-                orderByColumn: params.sort,
-                isAsc: params.order
-            };
-            //console.log(curParams);
-            var json = $.extend(curParams, $.common.formToJSON("workOrderForm"));
-            //console.log(json);
-            return json;
-        },
-        columns: [
-            {
-                checkbox: true
-            },
-            {
-                field: 'poId',
-                title: '工单号',
-                visible: false
-            },
-            {
-                field: 'poNo',
-                title: '订单号'
-            },
-            {
-                field: 'workNo',
-                title: '工单号'
-            },
-            {
-                field: 'piNo',
-                title: '',
-                visible: false
-
-            },
-            {
-                field: 'pCode',
-                title: '客户代码',
-                visible: false
-            },
-            {
-                field: 'pName',
-                title: '公司名称',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "60px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "80px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-
-                formatter: paramsMatter
-            },
-            {
-                field: 'cpCode',
-                title: '成品代码'
-            },
-            {
-                field: 'cpQty',
-                title: '订单数量'
-            },
-            {
-                field: 'ylCpQty',
-                title: '投单数量'
-            },
-            {
-                field: 'cpInQty',
-                title: '完工入库数量'
-            },
-            {
-                field: 'qdQty',
-                title: '欠工单数量'
-            },
-            {
-                field: 'poDate',
-                title: '开单日期',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-            },
-            {
-                field: 'beginDate',
-                title: '开工日期',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-            },
-            {
-                field: 'endDate',
-                title: '完工日期',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-            },
-
-            {
-                field: 'sendDate',
-                title: '发货日期',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-            },
-            {
-                field: 'workorderClass',
-                title: '工单类型',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "60px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "80px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-            },
-
-            {
-                field: 'cpName',
-                title: '成品名称',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "60px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'cpType',
-                title: '规格型号',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "60px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'cpMachineno',
-                title: '机种',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "60px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-            },
-            {
-                field: 'cpDw',
-                title: '单位'
-            },
-
-            {
-                field: 'bzMemo',
-                title: '备注'
-            },
-            {
-                field: 'endFlag',
-                title: '是否结案',
-                formatter: function (value, index, row) {
-                    if (value == 1) {
-                        return "是";
-                    } else {
-                        return "否";
-                    }
-                }
-            },
-            {
-                field: 'chinaInOrOut',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'isDelete',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'cpwldm',
-                title: '成品料号',
-                visible: false
-            },
-            {
-                field: 'nowcpstockqty',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'NWX',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'haveprint',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'bomVersionNo',
-                title: '版本号',
-                visible: false
-            },
-            {
-                field: 'badQty',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'jaMan',
-                title: '',
-                visible: false
-
-            },
-            {
-                field: 'jaTime',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'department',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'cpWeizhi',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'mjWeizhi',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'versionNo',
-                title: '版本号',
-                visible: false
-            },
-            {
-                field: 'Factory',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'madeQty',
-                title: '制造数量',
-                visible: false
-            },
-            {
-                field: 'qMadeQty',
-                title: '损耗',
-                visible: false
-            }
-        ]
-    });
-
-    //搜索制工单列表
-    $("#poIdSearch").on("click", function () {
-        $("#workOrderTable").bootstrapTable('refresh');
-        $("#poId").val("");
-    })
-
-    //选择制工单
-    function selectWorkOrder() {
-        let row = $("#workOrderTable").bootstrapTable("getSelections");
-        $("#workOrderModal").modal("hide");
-        $("input[name='workOrderNo']").val(row[0].workNo);
-        $("input[name='orderNo']").val(row[0].poNo);
-        $("input[name='finishedCode']").val(row[0].cpCode);
-        $("input[name='orderQty']").val(row[0].ylCpQty);
-        let outsourceOrderNo = $("input[name='outsourceOrderNo']").val();
-        if (outsourceOrderNo.length > 0) {
-            $("input[name='outsourceOrderNo']").val("")
-        }
-    }
-
-    //选择委外单列表
-    $('#outsourceTable').bootstrapTable({
-        url: '/produce/outSourceOrderHead/list',
-        pagination: true,
-        pageNumber: 1,
-        pageSize: 10,
-        pageList: [10, 25, 50, 100],
-        showRefresh: true,
-        method: "post",
-        contentType: "application/x-www-form-urlencoded",
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
-        clickToSelect: true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        singleSelect: true,
-        height: 400,
-        queryParams: function (params) {
-            //console.log("123");
-            var curParams = {
-                // 传递参数查询参数
-                pageSize: params.limit,
-                pageNum: params.offset / params.limit + 1,
-                searchValue: params.search,
-                orderByColumn: params.sort,
-                isAsc: params.order
-            };
-            //console.log(curParams);
-            var json = $.extend(curParams, $.common.formToJSON("outsourceFrom"));
-            //console.log(json);
-            return json;
-        },
-        columns: [
-            {
-                checkbox: true
-            },
-            {
-                field: 'outsourceOrderNo',
-                title: '委外加工单号'
-            },
-            {
-                field: 'batchNumber',
-                title: '委外加工批号'
-            },
-            {
-                field: 'appointNo',
-                title: '厂商编号'
-            },
-            {
-                field: 'appointName',
-                title: '厂商名称',
-            },
-            {
-                field: 'createDate',
-                title: '开单日期'
-            },
-            {
-                field: 'createDate',
-                title: '交货日期'
-            },
-            {
-                field: 'processNo',
-                title: '加工工序编号'
-            },
-            {
-                field: 'processName',
-                title: '加工工序名称'
-            }
-        ]
-    });
-
-    //搜索委外单
-    $("#outsourceSearch").on("click", function () {
-        $("#outsourceTable").bootstrapTable('refresh');
-        $("#outsourceOrderNo").val("");
-    })
-
-    //选择委外单
-    function selectOutsource() {
-        let row = $("#outsourceTable").bootstrapTable("getSelections");
-        $("#outsourceModal").modal("hide");
-        $("input[name='outsourceOrderNo']").val(row[0].outsourceOrderNo);
-        let workOrderNo = $("input[name='workOrderNo']").val();
-        if (workOrderNo.length > 0) {
-            $("input[name='workOrderNo']").val("");
-            $("input[name='orderNo']").val("");
-            $("input[name='finishedCode']").val("");
-            $("input[name='orderQty']").val("");
-        }
-    }
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionHead/edit.html b/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionHead/edit.html
deleted file mode 100644
index 9ccbdef2..00000000
--- a/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionHead/edit.html
+++ /dev/null
@@ -1,1224 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <th:block th:include="include :: header('修改领料单')"/>
-    <th:block th:include="include :: datetimepicker-css"/>
-    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
-    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
-</head>
-<body class="white-bg">
-<div class="container-div">
-    <div class="row">
-        <div class="col-sm-12">
-
-        </div>
-        <form class="form-horizontal m" id="form-materialRequisitionHead-edit" th:object="${materialRequisitionHead}">
-            <input name="materialRequisitionNo" th:field="*{materialRequisitionNo}" type="hidden">
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">领料单号：</label>
-                <div class="col-sm-8">
-                    <input name="materialRequisitionNo" th:field="*{materialRequisitionNo}" class="form-control" type="text" required readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">制工单号：</label>
-                <div class="col-sm-8">
-                    <input name="workOrderNo" th:field="*{workOrderNo}" class="form-control" type="text" readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">委外单号：</label>
-                <div class="col-sm-8">
-                    <input name="outsourceOrderNo" th:field="*{outsourceOrderNo}" class="form-control" type="text" readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">部门名称：</label>
-                <div class="col-sm-8">
-                    <select name="departmentName" class="form-control m-b" th:with="type=${@dict.getType('sys_dept_type')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">领料人：</label>
-                <div class="col-sm-8">
-                    <input name="linkman" th:field="*{linkman}" class="form-control" type="text">
-                </div>
-            </div>
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">仓库号：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="stockNo" class="form-control m-b">-->
-<!--                        <option value="">所有</option>-->
-<!--                    </select>-->
-<!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
-<!--                </div>-->
-<!--            </div>-->
-            <div class="form-group">
-                <label class="col-sm-3 control-label">仓库名称：</label>
-                <div class="col-sm-8">
-                    <select name="stockName" class="form-control m-b">
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">出库类型：</label>
-                <div class="col-sm-8">
-                    <select name="outputClass" class="form-control m-b" required th:with="type=${@dict.getType('sys_out_type')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                th:value="${dict.dictValue}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">领料日期：</label>
-                <div class="col-sm-8">
-                    <div class="input-group date">
-                        <input name="outputDate" th:value="${#dates.format(materialRequisitionHead.outputDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required disabled>
-                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">订单号：</label>
-                <div class="col-sm-8">
-                    <input name="orderNo" th:field="*{orderNo}" class="form-control" type="text" readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">成品代码：</label>
-                <div class="col-sm-8">
-                    <input name="spare1" th:field="*{spare1}" class="form-control" type="text" readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">工单数量：</label>
-                <div class="col-sm-8">
-                    <input name="spare2" th:field="*{spare2}" class="form-control" type="text" readonly>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
-                </div>
-            </div>
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">结案否：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="endFlag" class="form-control m-b">-->
-<!--                        <option value="">所有</option>-->
-<!--                    </select>-->
-<!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">物料类别：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="itemClass" class="form-control m-b">-->
-<!--                    </select>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">确认否：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="confirmFlag" class="form-control m-b">-->
-<!--                        <option value="">所有</option>-->
-<!--                    </select>-->
-<!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">确认人：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="confirmMan" th:field="*{confirmMan}" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">确认时间：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <div class="input-group date">-->
-<!--                        <input name="confirmDate" th:value="${#dates.format(materialRequisitionHead.confirmDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">审核否：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="auditingFlag" class="form-control m-b">-->
-<!--                        <option value="">所有</option>-->
-<!--                    </select>-->
-<!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">审核人：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="auditingMan" th:field="*{auditingMan}" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">审核日期：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <div class="input-group date">-->
-<!--                        <input name="auditingDate" th:value="${#dates.format(materialRequisitionHead.auditingDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">核准否：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="approveFlag" class="form-control m-b">-->
-<!--                        <option value="">所有</option>-->
-<!--                    </select>-->
-<!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">核准人：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="approveMan" th:field="*{approveMan}" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">核准日期：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <div class="input-group date">-->
-<!--                        <input name="spproveDate" th:value="${#dates.format(materialRequisitionHead.spproveDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">开单日期：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <div class="input-group date">-->
-<!--                        <input name="createDate" th:value="${#dates.format(materialRequisitionHead.createDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
-<!--                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">领料否：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <select name="getFlag" class="form-control m-b">-->
-<!--                        <option value="">所有</option>-->
-<!--                    </select>-->
-<!--                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">生产批号：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="batchNum" th:field="*{batchNum}" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="spare1" th:field="*{spare1}" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="spare2" th:field="*{spare2}" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="spare3" th:field="*{spare3}" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="spare4" th:field="*{spare4}" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="spare5" th:field="*{spare5}" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-<!--            <div class="form-group">-->
-<!--                <label class="col-sm-3 control-label">：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="spare6" th:field="*{spare6}" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
-        </form>
-
-        <div class="col-sm-12">
-            <label>物料代码：</label>
-            <input type="text" name="wlCode" id="wlCode" class="form-control" placeholder="请输入物料代码"
-                   style="margin-bottom: 15px">
-            <button type="button" class="btn btn-success" id="itemTableSearch">搜索</button>
-            <button type="button" class="btn btn-success" onclick="itemTableReset()">重置</button>
-            <div class="col-sm-12 select-table table-striped" style="padding-bottom: 100px;">
-                <table id="bootstrap-table"></table>
-            </div>
-        </div>
-        <div class="col-sm-12" style="text-align: center">
-            <button type="button" class="btn btn-success" style="margin-top: 20px"
-                    onclick="addItem()">确定
-            </button>
-        </div>
-        <div class="col-sm-12 select-table table-striped" style="padding-bottom: 100px;">
-            <table id="selectItemTable"></table>
-            <!--            <button type="button" onclick="commit()" class="btn btn-primary"-->
-            <!--                    style="margin-top: 30px;margin-left: 620px;">提交-->
-            <!--            </button>-->
-            <!--            <button onclick="close()" class="btn btn-danger" type="button" style="margin-top: 30px;margin-left: 200px">-->
-            <!--                关闭-->
-            <!--            </button>-->
-        </div>
-
-        <div class="modal inmodal" id="workOrderModal" tabindex="-1"
-             role="dilog" aria-hidden="true">
-            <div class="modal-dialog" style="width: 800px;height: 600px;">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"
-                                aria-hidden="true"></button>
-                        <h4 class="modal-title">选择制工单</h4>
-                    </div>
-                    <div class="modal-body" style="text-align: center;">
-                        <div class="row" style="margin-bottom: 20px;">
-                            <div class="col-md-5">
-                                <form id="workOrderForm">
-                                    <div class="form-group">
-                                        <label class="control-label col-md-4">制工单号：</label>
-                                        <div class="col-md-8">
-                                            <input type="text" class="form-control"
-                                                   id="poId">
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
-                            <div class="col-md-2">
-                                <button type="button" class="btn btn-success" id="poIdSearch">搜索</button>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="table-responsive">
-                                    <table id="workOrderTable"
-                                           class="table table-striped table-responsive">
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary"
-                                onClick="selectWorkOrder();">选择
-                        </button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal" name="close">关闭</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="modal inmodal" id="outsourceModal" tabindex="-1"
-             role="dilog" aria-hidden="true">
-            <div class="modal-dialog" style="width: 800px;height: 600px;">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"
-                                aria-hidden="true"></button>
-                        <h4 class="modal-title">选择委外单</h4>
-                    </div>
-                    <div class="modal-body" style="text-align: center;">
-                        <div class="row" style="margin-bottom: 20px;">
-                            <div class="col-md-5">
-                                <form id="outsourceFrom">
-                                    <input type="text" class="form-control"
-                                           name="endFlag" value="0" style="display: none">
-                                    <div class="form-group">
-                                        <label class="control-label col-md-4">委外单号：</label>
-                                        <div class="col-md-8">
-                                            <input type="text" class="form-control"
-                                                   id="outsourceOrderNo">
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
-                            <div class="col-md-2">
-                                <button type="button" class="btn btn-success" id="outsourceSearch">搜索</button>
-                            </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="table-responsive">
-                                    <table id="outsourceTable"
-                                           class="table table-striped table-responsive">
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary"
-                                onClick="selectOutsource();">选择
-                        </button>
-                        <button type="button" class="btn btn-default" data-dismiss="modal" name="close">关闭</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-</div>
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: datetimepicker-js"/>
-<th:block th:include="include :: bootstrap-table-editable-js"/>
-<script th:src="@{/ajax/libs/select2/select2.js}"></script>
-<script th:inline="javascript">
-    var prefix = ctx + "produce/materialRequisitionHead";
-    $("#form-materialRequisitionHead-edit").validate({
-        focusCleanup: true
-    });
-
-    function submitHandler() {
-        // if ($.validate.form()) {
-        //     $.operate.save(prefix + "/edit", $('#form-materialRequisitionHead-edit').serialize());
-        // }
-        submit();
-    }
-
-    //鼠标移入，显示完整的数据
-    function paramsMatter(value, row, index) {
-        var span = document.createElement("span");
-        span.setAttribute("title", value);
-        span.innerHTML = value;
-        return span.outerHTML;
-    }
-
-    let getData = [[${materialRequisitionHead}]];
-    $("select[name='departmentName']").val(getData.departmentName).select2();
-    $("select[name='stockName']").val(getData.stcokName).select2();
-    $("select[name='outputClass']").val(getData.outputClass).select2();
-
-    $("input[name='workOrderNo']").on("click", function () {
-        $("#workOrderModal").modal("show");
-    })
-
-    $("input[name='outsourceOrderNo']").on("click", function () {
-        $("#outsourceModal").modal("show");
-    })
-
-    //获取仓库名
-    $.ajax({
-        url: ctx + "stock/stockInfo/all",
-        type: "post",
-        dataType: "json",
-        success: function (resp) {
-            if (resp.code === 0) {
-                let data = resp.data;
-                //alert(JSON.stringify(data));
-                for (let i in data) {
-                    $("select[name='stockName']").append("<option value='" + data[i].stockname + "'>" + data[i].stockname + "</option>");
-                }
-            } else {
-                $.modal.msgError(resp.msg);
-            }
-        },
-        error: function () {
-            $.modal.msgError("后台出错啦！");
-        }
-    })
-
-    //全部库存
-    $('#bootstrap-table').bootstrapTable({
-        url: ctx + "ck/itemCP/itemList",
-        method: 'post',
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        pagination: true, // 是否显示分页（*）
-        contentType: "application/x-www-form-urlencoded",
-        queryParams: function (params) {
-            var curParams = {
-                // 传递参数查询参数
-                pageSize: params.limit,
-                pageNum: params.offset / params.limit + 1
-                // searchValue:    params.search,
-                // orderByColumn:  params.sort,
-                // isAsc:          params.order
-            };
-            var wlCode = $("#wlCode").val();
-            //alert(wlCode);
-            var json = $.extend(curParams, {"wlCode": wlCode});
-            return json;
-        },
-        sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
-        pageNumber: 1, // 初始化加载第一页，默认第一页
-        pageSize: 5, // 每页的记录行数（*）
-        pageList: [5, 10, 50], // 可供选择的每页的行数（*）
-        clickToSelect: true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        // singleSelect : true,
-        height: 350,
-        columns: [{
-            checkbox: true
-        },
-            {
-                field: 'wlCode',
-                title: '物料代码',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemname',
-                title: '物料名称',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemstandard',
-                title: '规格',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'machineNo',
-                title: '机种'
-            },
-            {
-                field: 'stockDw',
-                title: '单位'
-            },
-            {
-                field: 'pWldm',
-                title: '客户料号'
-            },
-            {
-                field: 'itemClass',
-                title: '物料类别'
-            }
-        ]
-    });
-
-    //准备提交的item
-    $('#selectItemTable').bootstrapTable({
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        // contentType :"application/x-www-form-urlencoded",
-        // pageNumber : 1, // 初始化加载第一页，默认第一页
-        // pageSize : 10, // 每页的记录行数（*）
-        // pageList : [ 5, 10,50], // 可供选择的每页的行数（*）
-        // clickToSelect : true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        singleSelect: true,
-        height: 400,
-        uniqueId: 'itemCode',
-        // onEditableSave: function (field, row, oldValue, $el) {
-        //     if (row.qty > 0 && row.price > 0) {
-        //         row.totalPrice = row.qty * row.price;
-        //     }
-        // },
-        columns: [{
-            checkbox: false
-        },
-            {
-                field: 'itemCode',
-                title: '物料代码',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemName',
-                title: '物料名称',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'itemSpecification',
-                title: '规格型号',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'unit',
-                title: '单位'
-            },
-            {
-                field: 'spare1',
-                title: '物料类别'
-            },
-            {
-                field: 'spare2',
-                title: '使用量',
-                editable: {
-                    type: 'text',
-                    title: '数量',
-                    emptytext: "0",
-                    validate: function (value) {
-                        if (parseInt(value) < 0) {
-                            return '数量不能小于0！';
-                        }
-                        if (isNaN(value)) {
-                            return '数量必须是数字！';
-                        }
-                    }
-                }
-            },
-            {
-                field: 'planQty',
-                title: '计划数量',
-                editable: {
-                    type: 'text',
-                    title: '数量',
-                    emptytext: "0",
-                    validate: function (value) {
-                        if (parseInt(value) < 0) {
-                            return '数量不能小于0！';
-                        }
-                        if (isNaN(value)) {
-                            return '数量必须是数字！';
-                        }
-                    }
-                }
-            },
-            {
-                field: 'remark',
-                title: '备注',
-                editable: {
-                    type: 'text',
-                    title: '说明',
-                    emptytext: ""
-                }
-            },
-            {
-                title: '操作',
-                align: 'center',
-                formatter: function (value, row, index) {
-                    var actions = [];
-                    actions.push('<a class="btn btn-danger btn-xs ' + '" href="javascript:void(0)" onclick="remove(\'' + row.itemCode + '\')"><i class="fa fa-remove"></i>删除</a>');
-                    return actions.join('');
-                }
-            }
-        ]
-    });
-
-    //item表格重置
-    function itemTableReset() {
-        $("input[name='wlCode']").val("");
-        $("#bootstrap-table").bootstrapTable("refresh");
-    }
-
-    //搜索item表格
-    $("#itemTableSearch").on("click", function () {
-        $("#bootstrap-table").bootstrapTable("refresh");
-    })
-
-    //将选中的bom引入待确认bom表格
-    function addItem() {
-        let row = $("#bootstrap-table").bootstrapTable("getSelections");
-        let count = $('#selectItemTable').bootstrapTable('getData').length;
-        for (let i = 0; i < row.length; i++) {
-            let bootstrapTable = $("#selectItemTable").bootstrapTable("getRowByUniqueId", row[i].wlCode);
-            //alert(bootstrapTable);
-            if (bootstrapTable != null) {
-                alert("物料代码" + row[i].wlCode + "已存在!");
-                continue;
-            }
-            $("#selectItemTable").bootstrapTable('insertRow', {
-                index: count + i,
-                row: {
-                    itemCode: row[i].wlCode,
-                    itemName: row[i].itemname,
-                    itemSpecification: row[i].itemstandard,
-                    unit: row[i].stockDw,
-                    spare1: row[i].itemClass,
-                    planQty: 0,
-                    spare2: 0
-                }
-            });
-        }
-        itemTableReset();
-    }
-
-    function remove(itemCode) {
-        $("#selectItemTable").bootstrapTable("remove", {
-            field: 'itemCode',
-            values: itemCode
-        });
-    }
-
-    //提交
-    function submit() {
-        let bootstrapTable = $("#selectItemTable").bootstrapTable("getData", true);
-        let formData = new FormData($("#form-materialRequisitionHead-edit")[0]);
-        formData.append("materialRequisitionLists", JSON.stringify(bootstrapTable));
-        let data1 = {};
-        formData.forEach((value, key) => data1[key] = value);
-        //alert(JSON.stringify(data1));
-        $.ajax({
-            url: prefix + "/edit",
-            type: "post",
-            resultType: "json",
-            data: {"jsonStr": JSON.stringify(data1)},
-            success: function (resp) {
-                if (resp.code === 0) {
-                    alert("修改成功！");
-                    // window.location.href = prefix;
-                    var index = parent.layer.getFrameIndex(window.name);
-                    var parent2 = window.parent;
-                    parent2.$.table.refresh();
-                    parent.layer.close(index);//关闭当前页
-                } else {
-                    $.modal.msgError(resp.msg);
-                }
-            },
-            error: function () {
-                $.modal.msgError("出错了！");
-            }
-        });
-    }
-
-    //选择制工单列表
-    $('#workOrderTable').bootstrapTable({
-        url: '/produce/workorderhead/list',
-        pagination: true,
-        pageNumber: 1,
-        pageSize: 10,
-        pageList: [10, 25, 50, 100],
-        showRefresh: true,
-        method: "post",
-        contentType: "application/x-www-form-urlencoded",
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
-        clickToSelect: true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        singleSelect: true,
-        height: 400,
-        queryParams: function (params) {
-            //console.log("123");
-            var curParams = {
-                // 传递参数查询参数
-                pageSize: params.limit,
-                pageNum: params.offset / params.limit + 1,
-                searchValue: params.search,
-                orderByColumn: params.sort,
-                isAsc: params.order
-            };
-            //console.log(curParams);
-            var json = $.extend(curParams, $.common.formToJSON("workOrderForm"));
-            //console.log(json);
-            return json;
-        },
-        columns: [
-            {
-                checkbox: true
-            },
-            {
-                field: 'poId',
-                title: '工单号',
-                visible: false
-            },
-            {
-                field: 'poNo',
-                title: '订单号'
-            },
-            {
-                field: 'workNo',
-                title: '工单号'
-            },
-            {
-                field: 'piNo',
-                title: '',
-                visible: false
-
-            },
-            {
-                field: 'pCode',
-                title: '客户代码',
-                visible: false
-            },
-            {
-                field: 'pName',
-                title: '公司名称',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "60px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "80px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-
-                formatter: paramsMatter
-            },
-            {
-                field: 'cpCode',
-                title: '成品代码'
-            },
-            {
-                field: 'cpQty',
-                title: '订单数量'
-            },
-            {
-                field: 'ylCpQty',
-                title: '投单数量'
-            },
-            {
-                field: 'cpInQty',
-                title: '完工入库数量'
-            },
-            {
-                field: 'qdQty',
-                title: '欠工单数量'
-            },
-            {
-                field: 'poDate',
-                title: '开单日期',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-            },
-            {
-                field: 'beginDate',
-                title: '开工日期',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-            },
-            {
-                field: 'endDate',
-                title: '完工日期',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-            },
-
-            {
-                field: 'sendDate',
-                title: '发货日期',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "80px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "100px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-            },
-            {
-                field: 'workorderClass',
-                title: '工单类型',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "60px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "80px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-            },
-
-            {
-                field: 'cpName',
-                title: '成品名称',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "60px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'cpType',
-                title: '规格型号',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "60px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-                formatter: paramsMatter
-            },
-            {
-                field: 'cpMachineno',
-                title: '机种',
-                cellStyle: function (value, row, index) {
-                    return {
-                        css: {
-                            "min-width": "60px",
-                            "text-overflow": "ellipsis",
-                            "overflow": "hidden",
-                            "max-width": "150px",
-                            "white-space": "nowrap"
-                        }
-                    }
-                },
-            },
-            {
-                field: 'cpDw',
-                title: '单位'
-            },
-
-            {
-                field: 'bzMemo',
-                title: '备注'
-            },
-            {
-                field: 'endFlag',
-                title: '是否结案',
-                formatter: function (value, index, row) {
-                    if (value == 1) {
-                        return "是";
-                    } else {
-                        return "否";
-                    }
-                }
-            },
-            {
-                field: 'chinaInOrOut',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'isDelete',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'cpwldm',
-                title: '成品料号',
-                visible: false
-            },
-            {
-                field: 'nowcpstockqty',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'NWX',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'haveprint',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'bomVersionNo',
-                title: '版本号',
-                visible: false
-            },
-            {
-                field: 'badQty',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'jaMan',
-                title: '',
-                visible: false
-
-            },
-            {
-                field: 'jaTime',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'department',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'cpWeizhi',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'mjWeizhi',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'versionNo',
-                title: '版本号',
-                visible: false
-            },
-            {
-                field: 'Factory',
-                title: '',
-                visible: false
-            },
-            {
-                field: 'madeQty',
-                title: '制造数量',
-                visible: false
-            },
-            {
-                field: 'qMadeQty',
-                title: '损耗',
-                visible: false
-            }
-        ]
-    });
-
-    //搜索制工单列表
-    $("#poIdSearch").on("click", function () {
-        $("#workOrderTable").bootstrapTable('refresh');
-        $("#poId").val("");
-    })
-
-    //选择制工单
-    function selectWorkOrder() {
-        let row = $("#workOrderTable").bootstrapTable("getSelections");
-        $("#workOrderModal").modal("hide");
-        $("input[name='workOrderNo']").val(row[0].workNo);
-        $("input[name='orderNo']").val(row[0].poNo);
-        $("input[name='finishedCode']").val(row[0].cpCode);
-        $("input[name='orderQty']").val(row[0].ylCpQty);
-        let outsourceOrderNo = $("input[name='outsourceOrderNo']").val();
-        if (outsourceOrderNo.length > 0) {
-            $("input[name='outsourceOrderNo']").val("")
-        }
-    }
-
-    //选择委外单列表
-    $('#outsourceTable').bootstrapTable({
-        url: '/produce/outSourceOrderHead/list',
-        pagination: true,
-        pageNumber: 1,
-        pageSize: 10,
-        pageList: [10, 25, 50, 100],
-        showRefresh: true,
-        method: "post",
-        contentType: "application/x-www-form-urlencoded",
-        striped: true, // 是否显示行间隔色
-        cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
-        clickToSelect: true, // 是否启用点击选中行
-        showToggle: false, // 是否显示详细视图和列表视图的切换按钮
-        cardView: false, // 是否显示详细视图
-        detailView: false, // 是否显示父子表
-        smartDisplay: false, // 加了这个才显示每页显示的行数
-        showExport: false, // 是否显示导出按钮
-        singleSelect: true,
-        height: 400,
-        queryParams: function (params) {
-            //console.log("123");
-            var curParams = {
-                // 传递参数查询参数
-                pageSize: params.limit,
-                pageNum: params.offset / params.limit + 1,
-                searchValue: params.search,
-                orderByColumn: params.sort,
-                isAsc: params.order
-            };
-            //console.log(curParams);
-            var json = $.extend(curParams, $.common.formToJSON("outsourceFrom"));
-            //console.log(json);
-            return json;
-        },
-        columns: [
-            {
-                checkbox: true
-            },
-            {
-                field: 'outsourceOrderNo',
-                title: '委外加工单号'
-            },
-            {
-                field: 'batchNumber',
-                title: '委外加工批号'
-            },
-            {
-                field: 'appointNo',
-                title: '厂商编号'
-            },
-            {
-                field: 'appointName',
-                title: '厂商名称',
-            },
-            {
-                field: 'createDate',
-                title: '开单日期'
-            },
-            {
-                field: 'createDate',
-                title: '交货日期'
-            },
-            {
-                field: 'processNo',
-                title: '加工工序编号'
-            },
-            {
-                field: 'processName',
-                title: '加工工序名称'
-            }
-        ]
-    });
-
-    //搜索委外单
-    $("#outsourceSearch").on("click", function () {
-        $("#outsourceTable").bootstrapTable('refresh');
-        $("#outsourceOrderNo").val("");
-    })
-
-    //选择委外单
-    function selectOutsource() {
-        let row = $("#outsourceTable").bootstrapTable("getSelections");
-        $("#outsourceModal").modal("hide");
-        $("input[name='outsourceOrderNo']").val(row[0].outsourceOrderNo);
-        let workOrderNo = $("input[name='workOrderNo']").val();
-        if (workOrderNo.length > 0) {
-            $("input[name='workOrderNo']").val("");
-            $("input[name='orderNo']").val("");
-            $("input[name='finishedCode']").val("");
-            $("input[name='orderQty']").val("");
-        }
-    }
-
-    var getList = [[${list}]];
-    for (let i = 0; i < getList.length; i++) {
-        // alert(getList[i].itemCode);
-        let count2 = $('#selectItemTable').bootstrapTable('getData').length;
-        $("#selectItemTable").bootstrapTable('insertRow', {
-            index: count2 + i,
-            row: {
-                itemCode: getList[i].itemCode,
-                itemName: getList[i].itemName,
-                itemSpecification: getList[i].itemSpecification,
-                unit: getList[i].unit,
-                spare1: getList[i].spare1,
-                spare2: getList[i].spare2,
-                planQty: getList[i].planQty,
-                remark: getList[i].remark
-            }
-        });
-    }
-
-</script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionHead/materialRequisitionHead.html b/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionHead/materialRequisitionHead.html
deleted file mode 100644
index 88f17cf9..00000000
--- a/ruoyi-admin/src/main/resources/templates/produce/materialRequisitionHead/materialRequisitionHead.html
+++ /dev/null
@@ -1,430 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<head>
-    <th:block th:include="include :: header('领料单列表')"/>
-    <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
-    <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
-</head>
-<body class="gray-bg">
-<div class="container-div">
-    <div class="row">
-        <div class="col-sm-12 search-collapse">
-            <form id="formId">
-                <div class="select-list">
-                    <ul>
-                        <li>
-                            <label>领料单号：</label>
-                            <input type="text" name="materialRequisitionNo"/>
-                        </li>
-                        <li>
-                            <label>制工单号：</label>
-                            <input type="text" name="workOrderNo"/>
-                        </li>
-                        <li>
-                            <label>物料代码：</label>
-                            <input type="text" name="itemCode"/>
-                        </li>
-                        <li>
-                            <label>物料名称：</label>
-                            <input type="text" name="itemName"/>
-                        </li>
-                        <li>
-                            <label>部门名称：</label>
-                            <select name="departmentName" class="form-control m-b"
-                                    th:with="type=${@dict.getType('process_class')}">
-                                <option value="">所有</option>
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                        th:value="${dict.dictValue}"></option>
-                            </select>
-                        </li>
-                        <li>
-                            <label>领料人：</label>
-                            <input type="text" name="linkman"/>
-                        </li>
-                        <!--                        <li>-->
-                        <!--                            <label>仓库号：</label>-->
-                        <!--                            <select name="stockNo">-->
-                        <!--                                <option value="">所有</option>-->
-                        <!--                                <option value="-1">代码生成请选择字典属性</option>-->
-                        <!--                            </select>-->
-                        <!--                        </li>-->
-                        <li>
-                            <label>仓库名称：</label>
-                            <select name="stockName" class="form-control m-b">
-                                <option value="">所有</option>
-                            </select>
-                        </li>
-                        <li>
-                            <label>出库类型：</label>
-                            <select name="outputClass" class="form-control m-b"
-                                    th:with="type=${@dict.getType('sys_out_type')}">
-                                <option value="">所有</option>
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                        th:value="${dict.dictValue}"></option>
-                            </select>
-                        </li>
-                        <li class="select-time">
-                            <label>领料日期：</label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
-                                   name="params[beginOutputDate]"/>
-                            <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
-                                   name="params[endOutputDate]"/>
-                        </li>
-                        <!--                        <li>-->
-                        <!--                            <label>备注：</label>-->
-                        <!--                            <input type="text" name="remark"/>-->
-                        <!--                        </li>-->
-                        <li>
-                            <label>结案否：</label>
-                            <select name="endFlag">
-                                <option value="">所有</option>
-                                <option value="1">已结案</option>
-                                <option value="0">未结案</option>
-                            </select>
-                        </li>
-                        <li>
-                            <label>物料类别：</label>
-                            <select name="itemClass" class="form-control m-b"
-                                    th:with="type=${@dict.getType('ck_meterialt_type')}">
-                                <option value="">所有</option>
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                        th:value="${dict.dictValue}"></option>
-                            </select>
-                        </li>
-                        <!--                        <li>-->
-                        <!--                            <label>确认否：</label>-->
-                        <!--                            <select name="confirmFlag">-->
-                        <!--                                <option value="">所有</option>-->
-                        <!--                                <option value="-1">代码生成请选择字典属性</option>-->
-                        <!--                            </select>-->
-                        <!--                        </li>-->
-                        <!--                        <li>-->
-                        <!--                            <label>确认人：</label>-->
-                        <!--                            <input type="text" name="confirmMan"/>-->
-                        <!--                        </li>-->
-                        <!--                        <li class="select-time">-->
-                        <!--                            <label>确认时间：</label>-->
-                        <!--                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"-->
-                        <!--                                   name="params[beginConfirmDate]"/>-->
-                        <!--                            <span>-</span>-->
-                        <!--                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"-->
-                        <!--                                   name="params[endConfirmDate]"/>-->
-                        <!--                        </li>-->
-                        <!--                        <li>-->
-                        <!--                            <label>审核否：</label>-->
-                        <!--                            <select name="auditingFlag">-->
-                        <!--                                <option value="">所有</option>-->
-                        <!--                                <option value="-1">代码生成请选择字典属性</option>-->
-                        <!--                            </select>-->
-                        <!--                        </li>-->
-                        <!--                        <li>-->
-                        <!--                            <label>审核人：</label>-->
-                        <!--                            <input type="text" name="auditingMan"/>-->
-                        <!--                        </li>-->
-                        <!--                        <li class="select-time">-->
-                        <!--                            <label>审核日期：</label>-->
-                        <!--                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"-->
-                        <!--                                   name="params[beginAuditingDate]"/>-->
-                        <!--                            <span>-</span>-->
-                        <!--                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"-->
-                        <!--                                   name="params[endAuditingDate]"/>-->
-                        <!--                        </li>-->
-                        <!--                        <li>-->
-                        <!--                            <label>核准否：</label>-->
-                        <!--                            <select name="approveFlag">-->
-                        <!--                                <option value="">所有</option>-->
-                        <!--                                <option value="-1">代码生成请选择字典属性</option>-->
-                        <!--                            </select>-->
-                        <!--                        </li>-->
-                        <!--                        <li>-->
-                        <!--                            <label>核准人：</label>-->
-                        <!--                            <input type="text" name="approveMan"/>-->
-                        <!--                        </li>-->
-                        <!--                        <li class="select-time">-->
-                        <!--                            <label>核准日期：</label>-->
-                        <!--                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"-->
-                        <!--                                   name="params[beginSpproveDate]"/>-->
-                        <!--                            <span>-</span>-->
-                        <!--                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"-->
-                        <!--                                   name="params[endSpproveDate]"/>-->
-                        <!--                        </li>-->
-                        <!--                        <li class="select-time">-->
-                        <!--                            <label>开单日期：</label>-->
-                        <!--                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"-->
-                        <!--                                   name="params[beginCreateDate]"/>-->
-                        <!--                            <span>-</span>-->
-                        <!--                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"-->
-                        <!--                                   name="params[endCreateDate]"/>-->
-                        <!--                        </li>-->
-                        <!--                        <li>-->
-                        <!--                            <label>委外单号：</label>-->
-                        <!--                            <input type="text" name="outsourceOrderNo"/>-->
-                        <!--                        </li>-->
-                        <!--                        <li>-->
-                        <!--                            <label>领料否：</label>-->
-                        <!--                            <select name="getFlag">-->
-                        <!--                                <option value="">所有</option>-->
-                        <!--                                <option value="-1">代码生成请选择字典属性</option>-->
-                        <!--                            </select>-->
-                        <!--                        </li>-->
-                        <!--                        <li>-->
-                        <!--                            <label>订单号：</label>-->
-                        <!--                            <input type="text" name="orderNo"/>-->
-                        <!--                        </li>-->
-                        <!--                        <li>-->
-                        <!--                            <label>生产批号：</label>-->
-                        <!--                            <input type="text" name="batchNum"/>-->
-                        <!--                        </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>：</label>-->
-                        <!--                                <input type="text" name="spare1"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>：</label>-->
-                        <!--                                <input type="text" name="spare2"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>：</label>-->
-                        <!--                                <input type="text" name="spare3"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>：</label>-->
-                        <!--                                <input type="text" name="spare4"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>：</label>-->
-                        <!--                                <input type="text" name="spare5"/>-->
-                        <!--                            </li>-->
-                        <!--                            <li>-->
-                        <!--                                <label>：</label>-->
-                        <!--                                <input type="text" name="spare6"/>-->
-                        <!--                            </li>-->
-                        <li>
-                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
-                                    class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-warning btn-rounded btn-sm" onclick="reset()"><i
-                                    class="fa fa-refresh"></i>&nbsp;重置</a>
-                        </li>
-                    </ul>
-                </div>
-            </form>
-        </div>
-
-        <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-success" onclick="$.operate.add()"
-               shiro:hasPermission="produce:materialRequisitionHead:add">
-                <i class="fa fa-plus"></i> 添加
-            </a>
-            <a class="btn btn-primary single disabled" onclick="edit()"
-               shiro:hasPermission="produce:materialRequisitionHead:edit">
-                <i class="fa fa-edit"></i> 修改
-            </a>
-            <a class="btn btn-danger multiple disabled" onclick=""
-               shiro:hasPermission="produce:materialRequisitionHead:remove" disabled>
-                <i class="fa fa-remove"></i> 删除
-            </a>
-            <a class="btn btn-warning" onclick="$.table.exportExcel()"
-               shiro:hasPermission="produce:materialRequisitionHead:export">
-                <i class="fa fa-download"></i> 导出
-            </a>
-            <a class="btn btn-primary single disabled" onclick="end()"
-               shiro:hasPermission="produce:materialRequisitionHead:edit">
-                <i class="fa fa-edit"></i> 结案
-            </a>
-        </div>
-        <div class="col-sm-12 select-table table-striped">
-            <table id="bootstrap-table"></table>
-        </div>
-    </div>
-</div>
-<th:block th:include="include :: footer"/>
-<script th:src="@{/ajax/libs/select2/select2.js}"></script>
-<script th:inline="javascript">
-    var editFlag = [[${@permission.hasPermi('produce:materialRequisitionHead:edit')}]];
-    var removeFlag = [[${@permission.hasPermi('produce:materialRequisitionHead:remove')}]];
-    var prefix = ctx + "produce/materialRequisitionHead";
-
-    //鼠标移入，显示完整的数据
-    function paramsMatter(value, row, index) {
-        var span = document.createElement("span");
-        span.setAttribute("title", value);
-        span.innerHTML = value;
-        return span.outerHTML;
-    }
-
-    //获取仓库名
-    $.ajax({
-        url: ctx + "stock/stockInfo/all",
-        type: "post",
-        dataType: "json",
-        success: function (resp) {
-            if (resp.code === 0) {
-                let data = resp.data;
-                //alert(JSON.stringify(data));
-                for (let i in data) {
-                    $("select[name='stockName']").append("<option value='" + data[i].stockname + "'>" + data[i].stockname + "</option>");
-                }
-            } else {
-                $.modal.msgError(resp.msg);
-            }
-        },
-        error: function () {
-            $.modal.msgError("后台出错啦！");
-        }
-    })
-
-    $(function () {
-        var options = {
-            url: prefix + "/headWithList",
-            createUrl: prefix + "/add",
-            updateUrl: prefix + "/edit/{id}",
-            removeUrl: prefix + "/remove",
-            exportUrl: prefix + "/export",
-            modalName: "领料单",
-            columns: [{
-                checkbox: true
-            },
-                {
-                    field: 'materialRequisitionNo',
-                    title: '领料单号'
-                },
-                {
-                    field: 'workOrderNo',
-                    title: '制工单号'
-                },
-                {
-                    field: 'batchNum',
-                    title: '生产批号'
-                },
-                {
-                    field: 'itemCode',
-                    title: '物料代码'
-                },
-                {
-                    field: 'itemName',
-                    title: '物料名称'
-                },
-                {
-                    field: 'itemSpecification',
-                    title: '规格型号'
-                },
-                {
-                    field: 'unit',
-                    title: '单位'
-                },
-                {
-                    field: 'outputDate',
-                    title: '领料日期'
-                },
-                {
-                    field: 'planQty',
-                    title: '计划数量'
-                },
-                {
-                    field: 'coinType',
-                    title: '币别'
-                },
-                {
-                    field: 'price',
-                    title: '单价'
-                },
-                {
-                    field: 'totalPrice',
-                    title: '总价'
-                },
-                {
-                    field: 'departmentName',
-                    title: '部门名称'
-                },
-                {
-                    field: 'linkman',
-                    title: '领料人'
-                },
-                {
-                    field: 'stockName',
-                    title: '仓库名称'
-                },
-                {
-                    field: 'outputClass',
-                    title: '出库类型'
-                },
-                {
-                    field: 'endFlag',
-                    title: '结案否',
-                    visible: false
-                },
-                {
-                    field: 'itemClass',
-                    title: '物料类别'
-                },
-                {
-                    field: 'getFlag',
-                    title: '领料否',
-                    visible: false
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function (value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.materialRequisitionNo + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.materialRequisitionNo + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
-        };
-        $.table.init(options);
-    });
-
-    function reset(){
-        $("select[name='departmentName']").val("").select2();
-        $("select[name='stockName']").val("").select2();
-        $("select[name='outputClass']").val("").select2();
-        $("select[name='endFlag']").val("").select2();
-        $("select[name='itemClass']").val("").select2();
-        $.form.reset();
-    }
-
-    //结案
-    function end() {
-        let row = $("#bootstrap-table").bootstrapTable("getSelections");
-        if (row[0].endFlag === "1") {
-            $.modal.msgError("已结案，无法再次结案！");
-            return false;
-        }
-        $.modal.confirm("是否确定结案？", function () {
-            $.ajax({
-                url: prefix+"/end",
-                type: "post",
-                dataType: "json",
-                data: {"materialRequisitionNo": row[0].materialRequisitionNo},
-                success: function (resp) {
-                    if (resp.code === 0) {
-                        //$.modal.msgSuccess("更新成功！");
-                        alert("结案成功！");
-                        window.location.reload();
-                    } else {
-                        $.modal.msgError(resp.msg);
-                    }
-                },
-                error: function () {
-                    $.modal.msgError("后台出错啦！");
-                }
-            })
-        });
-    }
-
-    //修改
-    function edit(){
-        let row = $("#bootstrap-table").bootstrapTable("getSelections");
-        if (row[0].getFlag==="1"){
-            $.modal.msgError("已出库！无法修改！");
-            return false;
-        }
-        $.operate.edit();
-    }
-
-</script>
-</body>
-</html>
\ No newline at end of file