diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/EndrealsemimaterialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/EndrealsemimaterialController.java
deleted file mode 100644
index bf0d3d97..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/EndrealsemimaterialController.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package org.nl.wms.basedata.master.rest;
-
-
-import com.alibaba.fastjson.JSONObject;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.annotation.Log;
-import org.nl.wms.basedata.master.service.EndrealsemimaterialService;
-import org.nl.wms.basedata.master.service.dto.EndrealsemimaterialDto;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
-* @author geng by
-* @date 2022-05-31
-**/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "成品对应半成品管理")
-@RequestMapping("/api/endrealsemimaterial")
-@Slf4j
-public class EndrealsemimaterialController {
-
-    private final EndrealsemimaterialService endrealsemimaterialService;
-
-    @GetMapping
-    @Log("查询成品对应半成品")
-    @ApiOperation("查询成品对应半成品")
-    //@PreAuthorize("@el.check('endrealsemimaterial:list')")
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page){
-        return new ResponseEntity<>(endrealsemimaterialService.queryAll(whereJson,page),HttpStatus.OK);
-    }
-
-    @PostMapping
-    @Log("新增成品对应半成品")
-    @ApiOperation("新增成品对应半成品")
-    //@PreAuthorize("@el.check('endrealsemimaterial:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody EndrealsemimaterialDto dto){
-        endrealsemimaterialService.create(dto);
-        return new ResponseEntity<>(HttpStatus.CREATED);
-    }
-
-    @PutMapping("/updateRawmaterial")
-    @Log("修改成品对应半成品")
-    @ApiOperation("修改成品对应半成品")
-    //@PreAuthorize("@el.check('semirealrawmaterial:edit')")
-    public ResponseEntity<Object> updateRawmaterial(@RequestBody JSONObject param){
-        endrealsemimaterialService.updateRawmaterial(param);
-        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-    }
-
-    @Log("删除成品对应半成品")
-    @ApiOperation("删除成品对应半成品")
-    //@PreAuthorize("@el.check('endrealsemimaterial:del')")
-    @DeleteMapping
-    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
-        endrealsemimaterialService.deleteAll(ids);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/EndrealsemimaterialService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/EndrealsemimaterialService.java
deleted file mode 100644
index 1d4b3fe4..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/EndrealsemimaterialService.java
+++ /dev/null
@@ -1,66 +0,0 @@
-
-package org.nl.wms.basedata.master.service;
-
-import com.alibaba.fastjson.JSONObject;
-import org.nl.wms.basedata.master.service.dto.EndrealsemimaterialDto;
-import org.springframework.data.domain.Pageable;
-
-import java.util.List;
-import java.util.Map;
-
-/**
-* @description 服务接口
-* @author geng by
-* @date 2022-05-31
-**/
-public interface EndrealsemimaterialService {
-
-    /**
-    * 查询数据分页
-    * @param whereJson 条件
-    * @param page 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(Map whereJson, Pageable page);
-
-    /**
-    * 查询所有数据不分页
-    * @param whereJson 条件参数
-    * @return List<EndrealsemimaterialDto>
-    */
-    List<EndrealsemimaterialDto> queryAll(Map whereJson);
-
-    /**
-     * 根据ID查询
-     * @param relation_id ID
-     * @return Endrealsemimaterial
-     */
-    EndrealsemimaterialDto findById(Long relation_id);
-
-    /**
-    * 根据编码查询
-    * @param code code
-    * @return Endrealsemimaterial
-    */
-    EndrealsemimaterialDto findByCode(String code);
-
-
-    /**
-    * 创建
-    * @param dto /
-    */
-    void create(EndrealsemimaterialDto dto);
-
-    /**
-     * 编辑
-     * @param param /
-     */
-    void updateRawmaterial(JSONObject param);
-
-    /**
-    * 多选删除
-    * @param ids /
-    */
-    void deleteAll(Long[] ids);
-
-}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/EndrealsemimaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/EndrealsemimaterialServiceImpl.java
deleted file mode 100644
index c8567771..00000000
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/EndrealsemimaterialServiceImpl.java
+++ /dev/null
@@ -1,133 +0,0 @@
-
-package org.nl.wms.basedata.master.service.impl;
-
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.nl.utils.SecurityUtils;
-import org.nl.wms.basedata.master.service.EndrealsemimaterialService;
-import org.nl.wms.basedata.master.service.dto.EndrealsemimaterialDto;
-import org.nl.wql.WQL;
-import org.nl.wql.core.bean.WQLObject;
-import org.nl.wql.util.WqlUtil;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Map;
-
-/**
-* @description 服务实现
-* @author geng by
-* @date 2022-05-31
-**/
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class EndrealsemimaterialServiceImpl implements EndrealsemimaterialService {
-
-    @Override
-    public Map<String,Object> queryAll(Map whereJson, Pageable page){
-        String search = MapUtil.getStr(whereJson, "search");
-        JSONObject map = new JSONObject();
-        map.put("flag", "1");
-        if (!StrUtil.isEmpty(search)) {
-            map.put("search", "%" + search + "%");
-        }
-        JSONObject json = WQL.getWO("QMD_ME_ENDREALRAWMATERIAL001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "endRealRawMaterial.semi_material_id desc");
-        return json;
-    }
-
-    @Override
-    public List<EndrealsemimaterialDto> queryAll(Map whereJson){
-             WQLObject wo = WQLObject.getWQLObject("md_me_endrealsemimaterial");
-            JSONArray arr = wo.query().getResultJSONArray(0);
-             if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(EndrealsemimaterialDto.class);
-            return null;
-    }
-
-    @Override
-    public EndrealsemimaterialDto findById(Long relation_id) {
-        WQLObject wo = WQLObject.getWQLObject("md_me_endrealsemimaterial");
-        JSONObject json = wo.query("relation_id = '" + relation_id + "'").uniqueResult(0);
-        if (ObjectUtil.isNotEmpty(json)){
-                 return  json.toJavaObject( EndrealsemimaterialDto.class);
-        }
-        return null;
-    }
-
-    @Override
-    public EndrealsemimaterialDto findByCode(String  code) {
-        WQLObject wo = WQLObject.getWQLObject("md_me_endrealsemimaterial");
-        JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
-        if (ObjectUtil.isNotEmpty(json)){
-             return  json.toJavaObject( EndrealsemimaterialDto.class);
-        }
-        return null;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void create(EndrealsemimaterialDto dto) {
-        Long currentUserId = SecurityUtils.getCurrentUserId();
-        String nickName = SecurityUtils.getNickName();
-        String now = DateUtil.now();
-
-        dto.setRelation_id(IdUtil.getSnowflake(1, 1).nextId());
-        dto.setCreate_id(currentUserId);
-        dto.setCreate_name(nickName);
-        dto.setUpdate_optid(currentUserId);
-        dto.setUpdate_optname(nickName);
-        dto.setUpdate_time(now);
-        dto.setCreate_time(now);
-
-        WQLObject wo = WQLObject.getWQLObject("md_me_endrealsemimaterial");
-        JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
-        wo.insert(json);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void updateRawmaterial(JSONObject param) {
-        Long currentUserId = SecurityUtils.getCurrentUserId();
-        String nickName = SecurityUtils.getNickName();
-        String now = DateUtil.now();
-        String relation_id = param.getString("relation_id");
-        String semi_material_id = param.getString("semi_material_id");
-        JSONObject map = new JSONObject();
-        map.put("semi_material_id", semi_material_id);
-        map.put("update_optid", currentUserId);
-        map.put("update_optname", nickName);
-        map.put("update_time", now);
-        WQLObject wo = WQLObject.getWQLObject("MD_ME_EndRealSemiMaterial");
-        wo.update(map, "relation_id = '" + relation_id + "'");
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void deleteAll(Long[] ids) {
-        Long currentUserId = SecurityUtils.getCurrentUserId();
-        String nickName = SecurityUtils.getNickName();
-        String now = DateUtil.now();
-        WQLObject wo = WQLObject.getWQLObject("md_me_semirealrawmaterial");
-        for (Long relation_id : ids) {
-            JSONObject param = new JSONObject();
-            param.put("relation_id", String.valueOf(relation_id));
-            param.put("raw_material_id", "");
-            param.put("update_optid", currentUserId);
-            param.put("update_optname", nickName);
-            param.put("update_time", now);
-            wo.update(param);
-        }
-    }
-        
-}
diff --git a/mes/qd/src/api/wms/basedata/master/endrealsemimaterial.js b/mes/qd/src/api/wms/basedata/master/endrealsemimaterial.js
deleted file mode 100644
index e9944102..00000000
--- a/mes/qd/src/api/wms/basedata/master/endrealsemimaterial.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/endrealsemimaterial',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/endrealsemimaterial/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/endrealsemimaterial',
-    method: 'put',
-    data
-  })
-}
-
-export function updateRawmaterial(data) {
-  return request({
-    url: 'api/endrealsemimaterial/updateRawmaterial',
-    method: 'put',
-    data
-  })
-}
-
-export default { add, edit, del, updateRawmaterial }
diff --git a/mes/qd/src/views/wms/basedata/master/endrealsemimaterial/SelectEndMaterialDialog.vue b/mes/qd/src/views/wms/basedata/master/endrealsemimaterial/SelectEndMaterialDialog.vue
deleted file mode 100644
index b0c8f58f..00000000
--- a/mes/qd/src/views/wms/basedata/master/endrealsemimaterial/SelectEndMaterialDialog.vue
+++ /dev/null
@@ -1,219 +0,0 @@
-<template>
-  <el-dialog
-    title="原材料选择"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    width="1000px"
-    @close="close"
-    @open="open"
-  >
-    <el-form
-      :inline="true"
-      class="demo-form-inline"
-      label-position="right"
-      label-width="80px"
-      label-suffix=":"
-    >
-      <el-form-item label="物料类别">
-        <treeselect
-          v-model="query.material_type_id"
-          :load-options="loadClass"
-          :options="classes"
-          style="width: 200px;"
-          placeholder="选择物料类别"
-        />
-      </el-form-item>
-      <el-form-item label="模糊搜索">
-        <el-input
-          v-model="query.search"
-          clearable
-          size="mini"
-          placeholder="编码、名称"
-          @keyup.enter.native="crud.toQuery"
-        />
-      </el-form-item>
-      <rrOperation />
-    </el-form>
-
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      :data="crud.data"
-      style="width: 100%;"
-      size="mini"
-      border
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-      @select="handleSelectionChange"
-      @select-all="onSelectAll"
-      @current-change="clickChange"
-    >
-      <el-table-column v-if="!isSingle" type="selection" width="55" />
-      <el-table-column v-if="isSingle" label="选择" width="55">
-        <template slot-scope="scope">
-          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="material_code" label="原材料编码" min-width="150" show-overflow-tooltip />
-      <el-table-column prop="material_name" label="原材料名称" min-width="200" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="原材料规格" show-overflow-tooltip />
-      <el-table-column prop="material_model" label="型号" />
-      <el-table-column prop="class_code" label="分类编码" />
-      <el-table-column prop="class_name" label="物料分类" />
-      <el-table-column
-        show-overflow-tooltip
-        min-width="100"
-        prop="product_series_name"
-        label="系列"
-      />
-      <el-table-column prop="unit_name" label="计量单位" />
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="submit">确 定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-
-import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
-import CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudClassstandard from '@/api/wms/basedata/master/classstandard'
-import crudEndrealsemimaterial from '@/api/wms/basedata/master/endrealsemimaterial'
-
-export default {
-  name: 'SelectRawMaterialDialog',
-  components: { rrOperation, pagination, Treeselect },
-  cruds() {
-    return CRUD({ title: '物料', url: 'api/Materialbase', crudMethod: { ...crudMaterialbase }, optShow: {}})
-  },
-  mixins: [presenter(), header()],
-  dicts: ['product_series'],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    isSingle: {
-      type: Boolean,
-      default: true
-    },
-    materOptCode: {
-      type: String,
-      default: '01'
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      relation_id: '',
-      classes: [],
-      tableRadio: null,
-      class_idStr: null,
-      checkrow: null,
-      rows: []
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    setForm(relation_id) {
-      this.relation_id = relation_id
-    },
-    clickChange(item) {
-      this.tableRadio = item
-    },
-    open() {
-      const param = {
-        'materOpt_code': this.materOptCode
-      }
-      crudMaterialbase.getMaterOptType(param).then(res => {
-        this.class_idStr = res.class_idStr
-        this.crud.query.class_idStr = res.class_idStr
-        this.crud.toQuery()
-        this.queryClassId()
-      })
-    },
-    queryClassId() {
-      const param = {
-        'class_idStr': this.class_idStr
-      }
-      crudClassstandard.queryClassById(param).then(res => {
-        this.classes = res.content.map(obj => {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    handleSelectionChange(val, row) {
-      if (this.isSingle) {
-        if (val.length > 1) {
-          this.$refs.table.clearSelection()
-          this.$refs.table.toggleRowSelection(val.pop())
-        } else {
-          this.checkrow = row
-        }
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-    },
-    close() {
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged3', this.tableRadio)
-    },
-    submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        crudEndrealsemimaterial.updateRawmaterial({ relation_id: this.relation_id, semi_material_id: this.tableRadio.material_id }).then(res => {
-          this.$emit('update:dialogShow', false)
-          this.$emit('tableChanged3', this.tableRadio)
-        })
-      } else {
-        crudEndrealsemimaterial.updateRawmaterial({ relation_id: this.relation_id, semi_material_id: '' }).then(res => {
-          this.$emit('update:dialogShow', false)
-          this.$emit('tableChanged3', this.tableRadio)
-        })
-      }
-    },
-    loadClass({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    }
-  }
-}
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-::v-deep .el-dialog__body {
-  padding-top: 0px;
-}
-</style>
-
diff --git a/mes/qd/src/views/wms/basedata/master/endrealsemimaterial/index.vue b/mes/qd/src/views/wms/basedata/master/endrealsemimaterial/index.vue
deleted file mode 100644
index 3cc51e98..00000000
--- a/mes/qd/src/views/wms/basedata/master/endrealsemimaterial/index.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 半成品列表-->
-    <!--工具栏-->
-    <div class="head-container">
-        <!-- 搜索 -->
-        <label class="el-form-item-label">模糊搜索</label>
-        <el-input v-model="query.search" clearable size="small" placeholder="输入编码或者名称" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-        <rrOperation />
-      </div>
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      :data="crud.data"
-      size="mini"
-      highlight-current-row
-      style="width: 100%;"
-      :cell-style="{'text-align':'center'}"
-      :header-cell-style="{'text-align':'center'}"
-      @selection-change="crud.selectionChangeHandler"
-    >
-      <el-table-column prop="material_code" label="成品编码" :min-width="100" show-overflow-tooltip />
-      <el-table-column prop="material_name" label="成品名称" :min-width="180" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="成品规格" :min-width="150" show-overflow-tooltip />
-      <el-table-column prop="class_name" label="成品系列" :min-width="100" show-overflow-tooltip />
-      <el-table-column prop="ymaterial_code" label="对应半成品编码" :min-width="120" show-overflow-tooltip />
-      <el-table-column prop="ymaterial_name" label="对应半成品名称" :min-width="180" show-overflow-tooltip />
-      <el-table-column prop="ymaterial_spec" label="对应半成品规格" :min-width="180" show-overflow-tooltip />
-      <el-table-column prop="yclass_name" label="对应半成品系列" :min-width="120" show-overflow-tooltip />
-      <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-        <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addMaterial(scope.row)">添加半成品</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-    <SelectEndMaterialDialog ref="selectEndMaterialDialog" :dialog-show.sync="selectEndMaterialDialog" @tableChanged3="tableChanged3"/>
-  </div>
-</template>
-
-<script>
-import crudEndrealsemimaterial from '@/api/wms/basedata/master/endrealsemimaterial'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import pagination from '@crud/Pagination'
-import SelectEndMaterialDialog from './SelectEndMaterialDialog'
-
-const defaultForm = { relation_id: null, end_material_id: null, semi_material_id: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
-
-export default {
-  name: 'Endrealsemimaterial',
-  components: { pagination, crudOperation, rrOperation, SelectEndMaterialDialog },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({ title: '成品对应半成品', url: 'api/endrealsemimaterial', idField: 'relation_id', sort: 'relation_id,desc',
-      optShow: {
-        add: false,
-        edit: false,
-        del: false,
-        download: false,
-        reset: false
-      },
-      crudMethod: { ...crudEndrealsemimaterial }})
-  },
-  data() {
-    return {
-      selectEndMaterialDialog: false,
-      permission: {
-      },
-      rules: {
-      }
-    }
-  },
-  methods: {
-    addMaterial(row) {
-      this.$refs.selectEndMaterialDialog.setForm(row.relation_id)
-      this.selectEndMaterialDialog = true
-      this.$refs.selectEndMaterialDialog.crud.toQuery()
-    },
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    tableChanged3() {
-      this.crud.toQuery()
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
-