diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/role/dao/SysRole.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/role/dao/SysRole.java
index d7d774ac..b7f58131 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/role/dao/SysRole.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/role/dao/SysRole.java
@@ -47,7 +47,7 @@ public class SysRole implements Serializable {
     /**
      * 排序
      */
-    private BigDecimal orderSeq;
+    private BigDecimal order_seq;
 
     /**
      * 备注
@@ -57,44 +57,44 @@ public class SysRole implements Serializable {
     /**
      * 是否启用
      */
-    private String isUsed;
+    private String is_used;
 
     /**
      * 是否删除
      */
-    private String isDelete;
+    private String is_delete;
 
     /**
      * 创建人标识
      */
-    private String createId;
+    private String create_id;
 
     /**
      * 创建人
      */
-    private String createName;
+    private String create_name;
 
     /**
      * 创建时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+    private Date create_time;
 
     /**
      * 修改人标识
      */
-    private String updateId;
+    private String update_id;
 
     /**
      * 修改人
      */
-    private String updateName;
+    private String update_name;
 
     /**
      * 修改时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    private Date update_time;
 
     /**
      * 角色菜单id
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/role/impl/SysRoleServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/role/impl/SysRoleServiceImpl.java
index 46ce0428..7f5a3661 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/role/impl/SysRoleServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/role/impl/SysRoleServiceImpl.java
@@ -70,12 +70,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
         // 插入
         sysRole.setRoleId(IdUtil.getSnowflake(1, 1).nextIdStr());
-        sysRole.setCreateId(userId);
-        sysRole.setCreateName(nickName);
-        sysRole.setCreateTime(new Date());
-        sysRole.setUpdateId(userId);
-        sysRole.setUpdateName(nickName);
-        sysRole.setUpdateTime(new Date());
+        sysRole.setCreate_id(userId);
+        sysRole.setCreate_name(nickName);
+        sysRole.setCreate_time(new Date());
+        sysRole.setUpdate_id(userId);
+        sysRole.setUpdate_name(nickName);
+        sysRole.setUpdate_time(new Date());
         roleMapper.insert(sysRole);
     }
 
@@ -94,9 +94,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         String userId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getCurrentNickName();
 
-        sysRole.setUpdateId(userId);
-        sysRole.setUpdateName(nickName);
-        sysRole.setUpdateTime(new Date());
+        sysRole.setUpdate_id(userId);
+        sysRole.setUpdate_name(nickName);
+        sysRole.setUpdate_time(new Date());
         roleMapper.updateById(sysRole);
     }
 
@@ -117,7 +117,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         Set<String> menuIds = new HashSet<>();
         for (int i = 0; i < menus.size(); i++) {
             JSONObject object = menus.getJSONObject(i);
-            menuIds.add(object.getString("menuId"));
+            menuIds.add(object.getString("menu_id"));
         }
         // 删除当前角色绑定的菜单
         roleMapper.deleteRoleMenuBatchRoleIds(Arrays.asList(roleId));
diff --git a/mes/qd/src/assets/icons/svg/入库.svg b/mes/qd/src/assets/icons/svg/入库.svg
new file mode 100644
index 00000000..6e803976
--- /dev/null
+++ b/mes/qd/src/assets/icons/svg/入库.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683277779772" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6475" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M672 960c-6.8 0-13.56-2.17-19.2-6.4l-256-192c-8.06-6.04-12.8-15.53-12.8-25.6s4.74-19.56 12.8-25.6l256-192A32 32 0 1 1 704 544v96h160c17.67 0 32 14.33 32 32v128c0 17.67-14.33 32-32 32H704v96a32 32 0 0 1-17.69 28.62A31.902 31.902 0 0 1 672 960zM469.33 736L640 864v-64c0-17.67 14.33-32 32-32h160v-64H672c-17.67 0-32-14.33-32-32v-64L469.33 736zM927.98 448c-6.81 0-13.67-2.16-19.49-6.64L512 136.37 115.51 441.36c-14.01 10.78-34.1 8.16-44.88-5.85s-8.15-34.1 5.85-44.87l416-320c11.5-8.85 27.52-8.85 39.02 0l416 320c14.01 10.78 16.63 30.87 5.85 44.87-6.29 8.19-15.78 12.49-25.37 12.49zM344 720h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10zM344 592h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10z" p-id="6476"></path><path d="M344 464h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10zM474.5 592h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10zM474.5 464h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10zM605 464h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10z" p-id="6477"></path><path d="M491 960H192c-17.67 0-32-14.33-32-32V343c0-17.67 14.33-32 32-32s32 14.33 32 32v553h267c17.67 0 32 14.33 32 32s-14.33 32-32 32z" p-id="6478"></path><path d="M832 574c-17.67 0-32-14.33-32-32V343c0-17.67 14.33-32 32-32s32 14.33 32 32v199c0 17.67-14.33 32-32 32z" p-id="6479"></path></svg>
\ No newline at end of file
diff --git a/mes/qd/src/assets/icons/svg/出库.svg b/mes/qd/src/assets/icons/svg/出库.svg
new file mode 100644
index 00000000..0cdf140f
--- /dev/null
+++ b/mes/qd/src/assets/icons/svg/出库.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683277801800" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7523" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M608 960c-4.88 0-9.78-1.11-14.31-3.38A32 32 0 0 1 576 928v-96H416c-17.67 0-32-14.33-32-32V672c0-17.67 14.33-32 32-32h160v-96a32 32 0 0 1 51.2-25.6l256 192c8.06 6.04 12.8 15.53 12.8 25.6s-4.74 19.56-12.8 25.6l-256 192c-5.65 4.23-12.4 6.4-19.2 6.4zM448 768h160c17.67 0 32 14.33 32 32v64l170.67-128L640 608v64c0 17.67-14.33 32-32 32H448v64zM927.98 448c-6.81 0-13.67-2.16-19.49-6.64L512 136.37 115.51 441.36c-14.01 10.78-34.1 8.16-44.88-5.85-10.78-14.01-8.15-34.1 5.85-44.87l416-320c11.5-8.85 27.52-8.85 39.02 0l416 320c14.01 10.78 16.63 30.87 5.85 44.87-6.29 8.19-15.78 12.49-25.37 12.49zM344 720h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10zM344 592h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10z" p-id="7524"></path><path d="M344 464h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10zM474.5 592h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10zM474.5 464h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10zM605 464h-60c-5.52 0-10-4.48-10-10v-60c0-5.52 4.48-10 10-10h60c5.52 0 10 4.48 10 10v60c0 5.52-4.48 10-10 10z" p-id="7525"></path><path d="M491 960H192c-17.67 0-32-14.33-32-32V343c0-17.67 14.33-32 32-32s32 14.33 32 32v553h267c17.67 0 32 14.33 32 32s-14.33 32-32 32z" p-id="7526"></path><path d="M832 574c-17.67 0-32-14.33-32-32V343c0-17.67 14.33-32 32-32s32 14.33 32 32v199c0 17.67-14.33 32-32 32z" p-id="7527"></path></svg>
\ No newline at end of file
diff --git a/mes/qd/src/assets/icons/svg/原材料.svg b/mes/qd/src/assets/icons/svg/原材料.svg
new file mode 100644
index 00000000..8de4f4e0
--- /dev/null
+++ b/mes/qd/src/assets/icons/svg/原材料.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683276427340" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2614" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M725.6 803.5c13.8-21.7 20.8-45 20.8-69.3 0-7.8-0.7-15.5-2.2-23.1L672.3 124.4c-0.2-1.2-0.4-2.5-0.7-3.6-4.8-31-21.2-59.6-47.4-81.7-29.8-25.2-69.3-39.1-111-39.1S431.9 13.9 402 39.1c-26.3 22.1-42.7 50.6-47.4 81.7-0.3 1.2-0.5 2.4-0.7 3.6L280.4 723.1c-0.2 1.6-0.3 3.1-0.2 4.7-0.1 2.1-0.2 4.3-0.2 6.4 0 24.3 7 47.6 20.8 69.3 12.5 19.7 30.2 37.2 52.4 52 43.2 28.8 100 44.6 160 44.6s116.8-15.8 160-44.6c22.2-14.7 39.9-32.3 52.4-52zM443.2 88.1c18.4-15.5 43.3-24 69.9-24s51.5 8.5 69.9 24c14.9 12.5 23.8 28.3 25.7 45h0.1l58.4 476c-42.4-26.4-96.8-40.8-154.1-40.8-57.4 0-111.8 14.5-154.3 40.9L417.4 133.1h0.1c1.9-16.7 10.8-32.5 25.7-45z m194.5 714.1c-32.8 21.9-77 33.9-124.5 33.9s-91.7-12-124.5-33.7C372 791.2 344 767.6 344 734.3c0-2 0.1-4 0.3-6l0.1-1.1c3.6-29.7 28.8-50.7 44.3-61 32.8-21.9 77-33.9 124.5-33.9s91.7 12 124.5 33.7c14.6 9.7 37.7 28.9 43.4 55.7l1.1 9.1c0 0.3 0.1 0.6 0.1 0.9 0 0.8 0.1 1.6 0.1 2.4 0 33.4-28 57-44.7 68.1z" fill="#030000" p-id="2615"></path><path d="M428.3 927.7c-6.1 0-11.9 1.7-16.8 4.7-31.5 17.8-71.6 27.6-114.3 27.6-47.5 0-91.7-12-124.5-33.9-16.7-11.1-44.7-34.7-44.7-68.1 0-33.3 28-57 44.7-68.1 14.7-9.8 31.6-17.5 50.1-23.2 13.7-3.6 23.9-16.1 23.9-31 0-17.7-14.3-32-32-32-3.9 0-7.7 0.7-11.2 2-21.9 6.7-42.3 15.9-60.5 27.2l58.5-476.2h0.2c1.9-16.7 10.8-32.5 25.7-45 13.3-11.2 29.9-18.7 48.1-22 14.9-2.8 26.1-15.8 26.1-31.4 0-17.7-14.3-32-32-32-2.6 0-5.2 0.3-7.7 0.9h-0.1c-28.3 5.6-54.4 17.7-75.7 35.6-26.3 22.2-42.8 50.8-47.5 82-0.3 1.1-0.5 2.2-0.6 3.4l-73.5 598.6c-0.2 1.5-0.2 2.9-0.2 4.4-0.1 2.3-0.2 4.5-0.2 6.8 0 24.3 7 47.6 20.8 69.3 12.5 19.7 30.2 37.3 52.4 52 43.2 28.8 100 44.6 160 44.6 54 0 105.4-12.8 146.7-36.4 9.6-5.4 16.3-15.8 16.3-27.8 0-17.7-14.3-32-32-32zM959.7 851.3c0-1.5 0-2.9-0.2-4.4L886 248.6c-0.1-1.2-0.3-2.3-0.6-3.4-4.6-31.2-21.1-59.8-47.4-82-21.2-17.9-47.3-30.1-75.6-35.6h-0.1c-2.4-0.6-5-0.9-7.6-0.9-17.7 0-32 14.3-32 32 0 15.6 11.3 28.6 26.1 31.4 18.2 3.3 34.8 10.8 48.1 22 14.9 12.5 23.8 28.3 25.7 45h0.2l58.6 475.8c-18.2-11.3-38.6-20.5-60.5-27.2-3.5-1.3-7.3-2-11.2-2-17.7 0-32 14.3-32 32 0 14.8 10.1 27.3 23.8 30.9 18.5 5.7 35.5 13.5 50.1 23.2 16.6 11.1 44.6 34.7 44.6 68s-27.9 56.9-44.6 68c-32.8 21.8-77 33.8-124.5 33.8-42.7 0-82.7-9.7-114.2-27.5-4.9-3-10.7-4.7-16.8-4.7-17.7 0-32 14.3-32 32 0 12 6.6 22.5 16.1 28.1 41.2 23.6 92.6 36.4 146.6 36.4 59.9 0 116.7-15.9 159.9-44.6 22.2-14.8 39.9-32.3 52.4-52 13.8-21.7 20.8-45 20.8-69.2 0-2.3-0.1-4.5-0.2-6.8z" fill="#030000" p-id="2616"></path></svg>
\ No newline at end of file
diff --git a/mes/qd/src/assets/icons/svg/库存盘点.svg b/mes/qd/src/assets/icons/svg/库存盘点.svg
new file mode 100644
index 00000000..3f81a6f0
--- /dev/null
+++ b/mes/qd/src/assets/icons/svg/库存盘点.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683277764423" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5417" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M948.57 424.68L532.7 71.85a32 32 0 0 0-41.4 0L75.43 424.68a32 32 0 1 0 41.4 48.8l11.07-9.39v463.65a32 32 0 1 0 64 0V410.31v-0.5L512 138.22l320.16 271.63v198.24a32 32 0 1 0 64 0V464.14l11 9.34a32 32 0 1 0 41.4-48.8z" fill="#666666" p-id="5418"></path><path d="M255.85 863.49m12 0l72 0q12 0 12 12l0 72q0 12-12 12l-72 0q-12 0-12-12l0-72q0-12 12-12Z" fill="#666666" p-id="5419"></path><path d="M399.86 863.49m12 0l72 0q12 0 12 12l0 72q0 12-12 12l-72 0q-12 0-12-12l0-72q0-12 12-12Z" fill="#666666" p-id="5420"></path><path d="M256.58 736.38m12 0l72 0q12 0 12 12l0 72q0 12-12 12l-72 0q-12 0-12-12l0-72q0-12 12-12Z" fill="#666666" p-id="5421"></path><path d="M256.58 608.9m12 0l72 0q12 0 12 12l0 72q0 12-12 12l-72 0q-12 0-12-12l0-72q0-12 12-12Z" fill="#666666" p-id="5422"></path><path d="M399.86 735.65m12 0l72 0q12 0 12 12l0 72q0 12-12 12l-72 0q-12 0-12-12l0-72q0-12 12-12Z" fill="#666666" p-id="5423"></path><path d="M543.86 863.49m12 0l72 0q12 0 12 12l0 72q0 12-12 12l-72 0q-12 0-12-12l0-72q0-12 12-12Z" fill="#666666" p-id="5424"></path><path d="M840.31 820.51A101.18 101.18 0 1 0 805.07 856l48.82 48.93a25 25 0 1 0 35.4-35.31z m-87.1-0.17a51.1 51.1 0 1 1 51.1-51.1 51.16 51.16 0 0 1-51.1 51.1z" fill="#666666" p-id="5425"></path></svg>
\ No newline at end of file
diff --git a/mes/qd/src/views/wms/storage_manage/product/moreOrless/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/product/moreOrless/AddDialog.vue
new file mode 100644
index 00000000..6e4d70d3
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/product/moreOrless/AddDialog.vue
@@ -0,0 +1,524 @@
+<template>
+  <el-dialog
+    :title="crud.status.title"
+    append-to-body
+    :before-close="crud.cancelCU"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+    fullscreen
+    width="1200px"
+    @open="open"
+    @close="close"
+  >
+    <el-row v-show="crud.status.cu > 0" :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
+      <el-form-item label="单据号" prop="bill_code">
+        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
+        <el-input v-model.trim="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="仓库" prop="stor_id">
+        <label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
+        <el-select
+          v-model="form.stor_id"
+          clearable
+          placeholder="仓库"
+          class="filter-item"
+          style="width: 210px"
+          :disabled="crud.status.view > 0"
+        >
+          <el-option
+            v-for="item in storlist"
+            :key="item.stor_id"
+            :label="item.stor_name"
+            :value="item.stor_id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="损溢类型" prop="mol_type">
+        <el-select
+          v-model="form.mol_type"
+          style="width: 210px"
+          clearable
+          class="filter-item"
+          :disabled="crud.status.view > 0"
+          @change="typeChange"
+        >
+          <el-option
+            v-for="item in dict.ST_MOL_TYPE"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="货位" prop="struct_code">
+        <label slot="label">货&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位:</label>
+        <el-input v-model.trim="form.struct_code" style="width: 210px" disabled placeholder="选择货位">
+          <el-button v-show="crud.status.view <= 0" slot="append" icon="el-icon-plus" @click="queryStruct()" />
+        </el-input>
+      </el-form-item>
+      <el-form-item label="明细数" prop="detail_count">
+        <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
+        <el-input v-model.trim="form.dtl_num" size="mini" disabled style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="总重量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
+        <el-input-number
+          v-model="form.total_qty"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <el-input v-model.trim="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+      </el-form-item>
+    </el-form>
+
+    <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+    <div class="crud-opts2" style="margin-bottom: 5px;">
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <!--<el-button
+          slot="left"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-search"
+          size="mini"
+          :disabled="crud.status.view > 0"
+          @click="resetTable()"
+        >
+          重置表格
+        </el-button>-->
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          :disabled="mater_btn"
+          @click="insertdtl()"
+        >
+          新增一行
+        </el-button>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="form.tableData"
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" align="center" width="150px">
+        <template scope="scope">
+          <el-input v-show="!scope.row.edit && scope.row.is_add" v-model="scope.row.storagevehicle_code" size="mini" />
+          <span v-show="scope.row.edit">{{ scope.row.storagevehicle_code }}</span>
+          <span v-show="!scope.row.edit && !scope.row.is_add">{{ scope.row.storagevehicle_code }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column show-overflow-tooltip prop="bucketunique" label="桶号" width="190" align="center">
+        <template scope="scope">
+          <el-input v-show="!scope.row.edit && scope.row.is_add" v-model="scope.row.bucketunique" disabled class="input-with-select">
+            <el-button slot="append" icon="el-icon-plus" @click="queryBucket(scope.$index, scope.row)" />
+          </el-input>
+          <span v-show="scope.row.edit">{{ scope.row.bucketunique }}</span>
+          <span v-show="!scope.row.edit && !scope.row.is_add">{{ scope.row.bucketunique }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="material_code" label="物料编码" align="center" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="material_name" label="物料名称" align="center" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="pcsn" label="批次号" align="center" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="quality_scode" label="品质类型" align="center" width="150px">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.quality_scode"
+            size="mini"
+            clearable
+            class="filter-item"
+            disabled
+          >
+            <el-option
+              v-for="item in dict.ST_QUALITY_SCODE"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ivt_level" label="库存等级" align="center" width="150px">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.ivt_level"
+            size="mini"
+            clearable
+            class="filter-item"
+            placeholder="无"
+            disabled
+          >
+            <el-option
+              v-for="item in dict.ST_IVT_LEVEL"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column prop="is_active" label="是否可用" align="center" width="150px">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.is_active"
+            size="mini"
+            clearable
+            class="filter-item"
+            placeholder="无"
+            disabled
+          >
+            <el-option
+              v-for="item in dict.is_used"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ivt_qty" label="库存重量" align="center" :formatter="crud.formatNum3" />
+      <el-table-column prop="mol_qty" width="220" label="损溢重量" align="center">
+        <template scope="scope">
+          <el-input-number v-model="scope.row.mol_qty" :disabled="scope.row.edit" :precision="3" :controls="false" :min="0" style="width: 120px" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="qty_unit_name" label="单位" align="center" />
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="190" fixed="right">
+        <template scope="scope">
+          <el-button
+            type="danger"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-delete"
+            @click.native.prevent="deleteRow(scope.$index, form.tableData)"
+          />
+          <el-button
+            v-show="!scope.row.edit"
+            type="primary"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-edit"
+            @click="handleEdit(scope.$index, scope.row)"
+          >编辑
+          </el-button>
+          <el-button
+            v-show="scope.row.edit"
+            type="success"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-check"
+            @click="handleEdit(scope.$index, scope.row)"
+          >完成
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <MaterDtl :dialog-show.sync="materShow" :dialog-matertype="materType" @tableChanged2="tableChanged2" />
+    <StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="tableChanged" />
+    <BucketDialog :dialog-show.sync="bucketShow" @bucketChange="tableChanged2" />
+  </el-dialog>
+</template>
+
+<script>
+import crudOperation from '@crud/CRUD.operation'
+import BucketDialog from '@/views/wms/storage_manage/product/moreOrless/NewBucketDialog'
+import CRUD, { crud, form } from '@crud/crud'
+import crudStorattr from '@/api/wms/basedata/st/storattr'
+import crudMoreOrless from '@/views/wms/storage_manage/product/moreOrless/moreorless'
+import MaterDtl from '@/views/wms/pub/MaterDialog'
+import StructDiv from '@/views/wms/storage_manage/product/moreOrless/StructDiv'
+
+const defaultForm = {
+  mol_id: '',
+  mol_code: '',
+  mol_type: '',
+  stor_id: '',
+  total_qty: '0',
+  dtl_num: '0',
+  bill_type: '',
+  remark: '',
+  struct_id: '',
+  sect_id: '',
+  sect_name: '',
+  struct_code: '',
+  struct_name: '',
+  tableData: []
+}
+
+export default {
+  name: 'AddDialog',
+  components: { crudOperation, MaterDtl, StructDiv, BucketDialog },
+  mixins: [crud(), form(defaultForm)],
+  dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_used', 'ST_MOL_TYPE'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    bussConfig: {
+      type: Object
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      materShow: false,
+      bucketShow: false,
+      structShow: false,
+      materType: '',
+      mater_btn: true,
+      storlist: [],
+      rules: {
+        stor_id: [
+          { required: true, message: '仓库不能为空', trigger: 'blur' }
+        ],
+        bill_type: [
+          { required: true, message: '业务类型不能为空', trigger: 'blur' }
+        ],
+        biz_date: [
+          { required: true, message: '业务日期不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      // 查询原材料库的仓库
+      crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
+        this.storlist = res.content
+      })
+    },
+    [CRUD.HOOK.afterToEdit]() {
+      // 获取入库单明细
+      crudMoreOrless.queryMolDtl({ 'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          row.isadd = false
+          row.edit = true
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    [CRUD.HOOK.afterToView]() {
+      this.mater_btn = true
+      crudMoreOrless.queryMolDetail({ 'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          row.edit = true
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    close() {
+      this.$emit('AddChanged')
+    },
+    [CRUD.HOOK.beforeSubmit]() {
+      debugger
+      // 提交前校验
+      if (this.form.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        if (!this.form.tableData[i].edit) {
+          this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
+          return false
+        }
+        const vehicle_code = this.form.tableData[i].storagevehicle_code
+        const same = this.form.tableData.some(mater => mater.storagevehicle_code !== vehicle_code)
+        if (same) {
+          this.crud.notify('存在不同载具号', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+      }
+    },
+    billTypeChange(val) {
+      this.form.tableData = []
+      this.form.total_qty = 0
+      this.form.dtl_num = 0
+    },
+    resetTable() {
+      if (!this.form.struct_id) {
+        this.crud.notify('请先选择货物！')
+        return false
+      }
+      if (this.crud.status.add > 0) {
+        crudMoreOrless.getStructIvt({ 'struct_id': this.form.struct_id }).then(res => {
+          this.form.tableData = res
+          this.form.dtl_num = this.form.tableData.length
+        })
+      }
+      if (this.crud.status.edit > 0) {
+        crudMoreOrless.queryMolDtl({ 'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id }).then(res => {
+          this.form.tableData = res
+          this.form.dtl_num = this.form.tableData.length
+        })
+      }
+    },
+    tableChanged2(row) {
+      // 新增一行物料时，给行进行赋值
+      this.nowrow.material_code = row.material_code
+      this.nowrow.material_id = row.material_id
+      this.nowrow.material_name = row.material_name
+      this.nowrow.qty_unit_id = row.qty_unit_id
+      this.nowrow.qty_unit_name = row.qty_unit_name
+      this.nowrow.quality_scode = row.quality_scode
+      this.nowrow.is_active = row.is_active
+      this.nowrow.ivt_level = row.ivt_level
+      this.nowrow.pcsn = row.pcsn
+      this.nowrow.mol_qty = row.storage_qty
+      this.nowrow.bucketunique = row.bucketunique
+      this.form.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
+    },
+    tableChanged(row) {
+      this.form.struct_id = row.struct_id
+      this.form.struct_code = row.struct_code
+      this.form.sect_id = row.sect_id
+      this.form.sect_name = row.sect_name
+      this.form.struct_name = row.struct_name
+      crudMoreOrless.getStructIvt({ 'struct_id': row.struct_id }).then(res => {
+        this.form.tableData = res
+        this.form.dtl_num = this.form.tableData.length
+      })
+    },
+
+    async queryMater(index, row) {
+      this.materShow = true
+      this.nowindex = index
+      this.nowrow = row
+    },
+    async queryStruct() {
+      if (!this.form.mol_type) {
+        this.crud.notify('请先选择损溢类型！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.structShow = true
+      this.$refs.child.getMsg(this.form.mol_type)
+    },
+    async queryBucket(index, row) {
+      this.bucketShow = true
+      this.nowindex = index
+      this.nowrow = row
+    },
+    async insertdtl() {
+      this.form.tableData.push({ quality_scode: '02', ivt_qty: 0, mol_qty: 0, is_active: '1', ivt_level: '01', edit: false, is_add: true })
+      this.form.dtl_num = this.form.tableData.length
+    },
+    typeChange(val) {
+      if (val === '1') {
+        this.mater_btn = false
+      } else {
+        this.mater_btn = true
+      }
+      this.form.tableData = []
+      this.form.struct_id = ''
+      this.form.struct_code = ''
+      this.form.sect_id = ''
+      this.form.sect_name = ''
+      this.form.struct_name = ''
+    },
+    handleEdit(index, row) {
+      if (!row.edit) {
+        if (parseFloat(row.mol_qty) <= 0) {
+          this.crud.notify('不允许损溢数量为0！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!row.material_id) {
+          this.crud.notify('物料不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!row.storagevehicle_code) {
+          this.crud.notify('载具号不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!row.bucketunique) {
+          this.crud.notify('桶号不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!row.pcsn) {
+          this.crud.notify('批次不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (this.form.mol_type === '0' && (parseFloat(row.ivt_qty) < parseFloat(row.mol_qty))) {
+          this.crud.notify('不允许损数量大于库存数量！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+      }
+      // 修改行的编辑状态
+      row.edit = !row.edit
+      this.form.tableData.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
+      if (row.edit) {
+        this.form.total_qty = 0
+        this.form.tableData.forEach((item) => {
+          this.form.total_qty = this.form.total_qty + item.mol_qty
+        })
+      }
+    },
+    deleteRow(index, rows) {
+      this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].mol_qty)
+      rows.splice(index, 1)
+      this.form.dtl_num = this.form.tableData.length
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 4px 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+}
+</style>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/product/moreOrless/NewBucketDialog.vue b/mes/qd/src/views/wms/storage_manage/product/moreOrless/NewBucketDialog.vue
new file mode 100644
index 00000000..6fa9ba07
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/product/moreOrless/NewBucketDialog.vue
@@ -0,0 +1,221 @@
+<template>
+  <el-dialog
+    title="桶记录选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <!-- 搜索 -->
+    <el-row>
+      <el-col :span="6">
+        <el-select
+          v-model="query.storagevehicle_type"
+          placeholder="桶类别"
+          clearable
+        >
+          <el-option
+            v-for="item in dict.MD_BUCKET_TYPE"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.bucketunique"
+          clearable
+          style="width: 200px"
+          size="mini"
+          placeholder="桶号"
+          class="filter-item"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-select
+          v-model="query.status"
+          placeholder="状态"
+          clearable
+          disabled
+        >
+          <el-option
+            v-for="item in dict.bucket_status"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-col>
+    </el-row>
+    <el-row style="padding-top: 10px;padding-bottom: 10px;">
+      <el-col :span="6">
+        <el-input
+          v-model="query.storagevehicle_code"
+          clearable
+          style="width: 200px"
+          size="mini"
+          placeholder="载具"
+          class="filter-item"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.material_search"
+          clearable
+          style="width: 200px"
+          size="mini"
+          placeholder="物料编码、名称"
+          class="filter-item"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.pcsn"
+          clearable
+          style="width: 200px"
+          size="mini"
+          placeholder="批次"
+          class="filter-item"
+        />
+      </el-col>
+      <el-col :span="6">
+        <rrOperation />
+      </el-col>
+    </el-row>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column prop="bucketunique" label="桶号" min-width="150" show-overflow-tooltip/>
+      <el-table-column prop="label" label="桶类别" />
+      <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip/>
+      <el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip/>
+      <el-table-column prop="pcsn" label="批次" />
+      <el-table-column prop="storage_qty" label="数量">
+        <template slot-scope="scope">
+          {{ fun(scope.row.storage_qty) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="qty_unit_name" label="单位" />
+      <el-table-column prop="quality_scode" :formatter="qualityFormat" label="品质类型" />
+      <el-table-column prop="ivt_level" :formatter="ivtFormat" label="库存等级" />
+      <el-table-column prop="is_active" :formatter="activeFormat" label="是否可用" />
+      <el-table-column prop="storagevehicle_code" label="载具号" />
+      <el-table-column prop="record_order" label="顺序号" />
+      <el-table-column prop="bag_qty" 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 CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import crudStructattr from '@/api/wms/basedata/st/structattr'
+import crudSectattr from '@/api/wms/basedata/st/sectattr'
+
+export default {
+  name: 'BucketDiv',
+  components: { crudOperation, rrOperation, pagination },
+  cruds() {
+    return CRUD({
+      title: '桶',
+      optShow: {},
+      query: { pcsn: '', storagevehicle_type: '', status: '01', bucketunique: '', storagevehicle_code: '', material_search: '' },
+      url: 'api/Bucket',
+      idField: 'bucket_record_id',
+      sort: 'bucket_record_id,desc',
+      crudMethod: { ...crudStructattr }
+    })
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  dicts: ['MD_BUCKET_TYPE', 'bucket_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'IS_OR_NOT'],
+  data() {
+    return {
+      sects: [],
+      classes: [],
+      dialogVisible: false,
+      bucket: {},
+      checkrow: {},
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    fun(val) {
+      return Number(val).toFixed(3)
+    },
+    open() {
+      crudSectattr.getSect().then(res => {
+        this.sects = res.content
+      })
+      this.crud.toQuery()
+    },
+    handleSelectionChange(val, row) {
+      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()
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选仓位')
+        return
+      }
+      this.$emit('update:dialogShow', false)
+      this.$emit('bucketChange', this.checkrow)
+    },
+    qualityFormat(row, column) {
+      return this.dict.label.ST_QUALITY_SCODE[row.quality_scode]
+    },
+    ivtFormat(row, column) {
+      return this.dict.label.ST_IVT_LEVEL[row.ivt_level]
+    },
+    activeFormat(row, column) {
+      return this.dict.label.IS_OR_NOT[row.is_active]
+    }
+  }
+}
+</script>
+
diff --git a/mes/qd/src/views/wms/storage_manage/product/moreOrless/StructDiv.vue b/mes/qd/src/views/wms/storage_manage/product/moreOrless/StructDiv.vue
new file mode 100644
index 00000000..0e2e1e08
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/product/moreOrless/StructDiv.vue
@@ -0,0 +1,218 @@
+<template>
+  <el-dialog
+    title="货位选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <!-- 搜索 -->
+    <el-row>
+      <el-col :span="6">
+        <el-cascader
+          v-model="query.sect"
+          placeholder="所属库区"
+          :options="sects"
+          :props="{ checkStrictly: true }"
+          clearable
+          @change="sectQueryChange"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.search"
+          clearable
+          style="width: 200px"
+          size="mini"
+          placeholder="输入货位编码、名称"
+          prefix-icon="el-icon-search"
+          class="filter-item"
+        /> </el-col>
+
+      <el-col :span="6">
+        <rrOperation />
+      </el-col>
+    </el-row>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column prop="struct_code" label="货位编码" />
+      <el-table-column prop="struct_name" label="货位名称" />
+      <el-table-column prop="sect_name" label="库区名称" />
+      <el-table-column prop="lock_type"  :formatter="lockFormat" label="是否锁定" />
+      <el-table-column prop="storagevehicle_code" 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 CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import crudStructattr from '@/api/wms/basedata/st/structattr'
+import crudSectattr from '@/api/wms/basedata/st/sectattr'
+
+export default {
+  name: 'StructDiv',
+  components: { crudOperation, rrOperation, pagination },
+  cruds() {
+    return CRUD({
+      title: '仓位',
+      optShow: {},
+      url: 'api/structattr',
+      idField: 'struct_id',
+      sort: 'struct_id,desc',
+      query: { search: '', is_lock: '1', sect_id: '', stor_id: '' },
+      crudMethod: { ...crudStructattr }
+    })
+  },
+  mixins: [presenter(), header()],
+  dicts: ['d_lock_type'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    sectProp: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      sects: [],
+      classes: [],
+      dialogVisible: false,
+      sect: {},
+      mol_type: '',
+      checkrow: {},
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    sectProp: {
+      handler(newValue, oldValue) {
+        this.sect = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.crud.resetQuery(false)
+      crudSectattr.getSect({ 'is_materialstore': '1' }).then(res => {
+        this.sects = res.content
+      })
+      if (this.sect) {
+        this.query.sect = this.sect
+        if (this.sect.length === 1) {
+          this.query.stor_id = this.sect[0]
+          this.query.sect_id = ''
+        }
+        if (this.sect.length === 0) {
+          this.query.sect_id = ''
+          this.query.stor_id = ''
+        }
+        if (this.sect.length === 2) {
+          this.query.stor_id = this.sect[0]
+          this.query.sect_id = this.sect[1]
+        }
+      }
+      this.query.is_used = '1'
+      this.query.is_delete = '0'
+      this.crud.toQuery()
+    },
+    sectQueryChange(val) {
+      if (val.length === 1) {
+        this.query.stor_id = val[0]
+        this.query.sect_id = ''
+      }
+      if (val.length === 0) {
+        this.query.sect_id = ''
+        this.query.stor_id = ''
+      }
+      if (val.length === 2) {
+        this.query.stor_id = val[0]
+        this.query.sect_id = val[1]
+      }
+      this.crud.toQuery()
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+        this.checkrow = row
+      } else {
+        this.checkrow = row
+      }
+    },
+    /**
+     * 接受父组件传值
+     * @param msg
+     */
+    getMsg(msg) {
+      this.mol_type = msg
+    },
+    lockFormat(row, column) {
+      return this.dict.label.d_lock_type[row.lock_type]
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.sects = null
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选仓位')
+        return
+      }
+      // 溢单不允许选择已锁定或者有载具的货位
+      if (this.mol_type === '1') {
+        if (this.checkrow.lock_type !== '00') {
+          this.$message('溢单不允许选择已锁定的货位！')
+          return
+        }
+      }
+      // 损单不允许选择已锁定或者无载具的货位
+      if (this.mol_type === '0') {
+        if (this.checkrow.lock_type !== '00') {
+          this.$message('损单不允许选择已锁定的货位！')
+          return
+        }
+        if (this.checkrow.storagevehicle_code === '') {
+          this.$message('损单不允许选择无载具的货位！')
+          return
+        }
+      }
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.checkrow)
+    }
+  }
+}
+</script>
+
diff --git a/mes/qd/src/views/wms/storage_manage/product/moreOrless/index.vue b/mes/qd/src/views/wms/storage_manage/product/moreOrless/index.vue
new file mode 100644
index 00000000..742b7f71
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/product/moreOrless/index.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="模糊查询">
+            <el-input
+              v-model="query.struct_search"
+              size="mini"
+              clearable
+              placeholder="货位编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="损溢类型">
+            <el-select
+              v-model="query.mol_type"
+              clearable
+              size="mini"
+              placeholder="损溢类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_MOL_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              clearable
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.mol_bill_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <rrOperation />
+        </el-form>
+
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          :disabled="confirm_flag"
+          icon="el-icon-check"
+          size="mini"
+          @click="confirm"
+        >
+          确认
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :max-height="590"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+        @current-change="handleCurrentChange"
+        @select="handleSelectionChange"
+        @select-all="onSelectAll"
+      >
+        <el-table-column
+          label="操作"
+          width="115"
+          align="center"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :disabled-edit="canUd(scope.row)"
+              :disabled-dle="canUd(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column :selectable="checkboxT" type="selection" width="55" />
+        <el-table-column  prop="mol_code" min-width="140" label="损溢单号">
+          <template slot-scope="scope">
+            <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.mol_code }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column  :formatter="typeFormat" prop="mol_inv_type" label="损溢类型" />
+        <el-table-column prop="struct_name" label="货位" min-width="150" />
+        <el-table-column label="明细数" align="center" prop="dtl_num" min-width="100" />
+        <el-table-column label="重量" align="center" prop="total_qty" min-width="100" >
+          <template slot-scope="scope">
+            {{ fun(scope.row.total_qty) }}
+          </template>
+        </el-table-column>
+        <el-table-column  :formatter="stateFormat" min-width="100" prop="status" label="单据状态" />
+        <el-table-column label="备注" align="center" min-width="100" prop="remark" />
+        <el-table-column  prop="create_mode" min-width="100" :formatter="create_modeFormat" label="生成方式" />
+        <el-table-column label="制单人" align="center" min-width="100" prop="input_optname" />
+        <el-table-column label="制单时间" align="center" prop="input_time" min-width="150" />
+        <el-table-column label="确认人" align="center" prop="confirm_optname" min-width="150" />
+        <el-table-column label="确认时间" align="center" prop="confirm_time" min-width="150" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <AddDialog @AddChanged="querytable" />
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import AddDialog from '@/views/wms/storage_manage/product/moreOrless/AddDialog'
+import { mapGetters } from 'vuex'
+import crudStorattr from '@/api/wms/basedata/st/storattr'
+
+export default {
+  name: 'MoreOrLess',
+  components: { AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '',
+      optShow: { add: true, reset: true},
+      props: {
+        // 每页数据条数
+        size: 20
+      },
+      idField: 'mol_id',
+      url: '/api/instor/mol',
+      crudMethod: { ...crudMoreOrless }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['mol_bill_status', 'ST_CREATE_MODE', 'ST_MOL_TYPE'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {
+        add: ['admin', 'user:add'],
+        edit: ['admin', 'user:edit'],
+        del: ['admin', 'user:del']
+      },
+      confirm_flag: true,
+      currentRow: null,
+      storlist: [],
+      statuslist: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
+      this.storlist = res.content
+    })
+  },
+  methods: {
+    fun(val) {
+      return Number(val).toFixed(3)
+    },
+    canUd(row) {
+      return row.status !== '10'
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+        this.buttonChange(row)
+      } else if (val.length === 1) {
+        this.buttonChange(row)
+      }else{
+        this.handleCurrentChange(null)
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+      this.handleCurrentChange(null)
+    },
+    buttonChange(current) {
+      if (current !== null) {
+        this.currentRow = current
+        if (current.bill_status !== '99') {
+          this.confirm_flag = false
+        } else {
+          this.confirm_flag = true
+        }
+      }
+    }
+    ,
+    querytable() {
+      this.onSelectAll()
+      this.crud.toQuery()
+      this.handleCurrentChange(null)
+    },
+    handleCurrentChange(currentRow) {
+      if (currentRow === null) {
+        this.currentRow = {}
+        this.confirm_flag = true
+      }
+    },
+    stateFormat(row, column) {
+      return this.dict.label.mol_bill_status[row.status]
+    },
+    typeFormat(row, column) {
+      return this.dict.label.ST_MOL_TYPE[row.mol_type]
+    },
+    create_modeFormat(row, column) {
+      return this.dict.label.ST_CREATE_MODE[row.create_mode]
+    },
+    checkboxT(row) {
+      return row.bill_status !== '99'
+    },
+    confirm() {
+      if (!this.currentRow) {
+        this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudMoreOrless.confirm(this.currentRow).then(res => {
+        this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.refresh()
+      })
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/product/moreOrless/moreorless.js b/mes/qd/src/views/wms/storage_manage/product/moreOrless/moreorless.js
new file mode 100644
index 00000000..e7cd5c38
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/product/moreOrless/moreorless.js
@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/instor/mol',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/instor/mol',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/instor/mol',
+    method: 'put',
+    data
+  })
+}
+
+export function getStructIvt(params) {
+  return request({
+    url: '/api/instor/mol/getStructIvt',
+    method: 'get',
+    params
+  })
+}
+
+export function queryMolDtl(params) {
+  return request({
+    url: '/api/instor/mol/queryMolDtl',
+    method: 'get',
+    params
+  })
+}
+
+export function queryMolDetail(params) {
+  return request({
+    url: '/api/instor/mol/queryMolDetail',
+    method: 'get',
+    params
+  })
+}
+
+export function confirm(data) {
+  return request({
+    url: '/api/instor/mol/confirm',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, getStructIvt, queryMolDtl, queryMolDetail, confirm }
diff --git a/mes/qd/src/views/wms/storage_manage/product/productCheck/ReCheckDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productCheck/ReCheckDialog.vue
index 77da3a5a..afd26544 100644
--- a/mes/qd/src/views/wms/storage_manage/product/productCheck/ReCheckDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productCheck/ReCheckDialog.vue
@@ -145,7 +145,7 @@
 <script>
 import CRUD, { crud } from '@crud/crud'
 import check from '@/views/wms/storage_manage/product/productCheck/check'
-// import BucketDialog from '@/views/wms/st/inStor/moreOrless/NewBucketDialog'
+// import BucketDialog from '@/views/wms/st/inStor/rawproductmoreOrless/NewBucketDialog'
 import MaterDialog from '@/views/wms/pub/MaterDialog'
 
 export default {
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/in/EndPointDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/in/EndPointDialog.vue
deleted file mode 100644
index 3ce8e2ab..00000000
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/in/EndPointDialog.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-  <el-dialog
-    title="请选择终点点位"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    width="1000px"
-    @close="close"
-    @open="open"
-  >
-    <el-row style="margin-bottom: 10px;">
-      <el-col :span="22">
-        <el-form :inline="true" class="demo-form-inline">
-          <el-form-item :inline="true" label="模糊搜索:">
-            <el-input v-model="query.search" placeholder="请输入点位编码或名称" />
-          </el-form-item>
-          <rrOperation />
-        </el-form>
-      </el-col>
-    </el-row>
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      :data="crud.data"
-      style="width: 100%;"
-      size="mini"
-      border
-      :cell-style="{'text-align':'center'}"
-      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
-      @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="struct_code" label="终点点位编码" show-overflow-tooltip />
-      <el-table-column prop="struct_name" label="终点点位名称" show-overflow-tooltip />
-      <el-table-column prop="area_type" label="所属区域" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ dict.label.sch_area_type[scope.row.area_type] }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="point_type" label="点位类型">
-        <template slot-scope="scope">
-          {{ dict.label.sch_point_type[scope.row.point_type] }}
-        </template>
-      </el-table-column>
-    </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 CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import crudPoint from '@/api/wms/sch/point'
-
-export default {
-  name: 'EndPointDialog',
-  components: { rrOperation, pagination },
-  dicts: ['sch_area_type', 'sch_point_type'],
-  cruds() {
-    return CRUD({ title: '终点点位', url: 'api/point/getEndPoint', crudMethod: { ...crudPoint }, optShow: {}})
-  },
-  mixins: [presenter(), header()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    isSingle: {
-      type: Boolean,
-      default: true
-    },
-    openParam: {
-      type: Object,
-      default: null
-    }
-  },
-  data() {
-    return {
-      formInline: {
-        search: ''
-      },
-      tableRadio: '',
-      tableData: [],
-      dialogVisible: false,
-      material: {}
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-        this.material = this.openParam
-      }
-    }
-  },
-  methods: {
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done()
-        })
-        .catch(_ => {
-        })
-    },
-    open() {
-      console.log(this.openParam)
-
-      this.query.material_id = this.openParam.material_id
-      this.query.area_type = this.openParam.area_type
-      this.query.vehicle_code = this.openParam.vehicle_code
-      this.query.qty = this.openParam.qty
-      this.crud.toQuery()
-    },
-    close() {
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-    },
-    submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged2', this.tableRadio)
-        return
-      }
-      this.rows = this.$refs.table.selection
-      if (this.rows.length <= 0) {
-        this.$message('请先选择终点点位')
-        return
-      }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged2', this.rows)
-    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-      } else {
-        this.checkrow = row
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-    },
-    clickChange(item) {
-      this.tableRadio = item
-    },
-    hand(value) {
-      this.crud.toQuery()
-    }
-  }
-}
-</script>
-
-<style scoped>
-.crud-opts2 {
-  padding: 4px 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-
-.crud-opts2 .crud-opts-right2 {
-  margin-left: auto;
-}
-
-.el-table_body tr.current-row>td {
-  background-color: #e9e500;
-}
-</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/in/MaterDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/in/MaterDialog.vue
deleted file mode 100644
index 5928dd03..00000000
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/in/MaterDialog.vue
+++ /dev/null
@@ -1,155 +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="模糊搜索">
-        <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
-      :cell-style="{'text-align':'center'}"
-      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
-      @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="物料编码" show-overflow-tooltip />
-      <el-table-column prop="material_name" label="物料名称" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="规格" show-overflow-tooltip />
-      <el-table-column prop="material_model" label="型号" />
-      <el-table-column prop="english_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 CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudWorkprocedureios from '@/api/wms/st/in/workprocedureios'
-
-export default {
-  name: 'MaterDialog',
-  components: { rrOperation, pagination },
-  cruds() {
-    return CRUD({ title: '物料', url: 'api/workprocedureiosIn/getMaterial', crudMethod: { ...crudWorkprocedureios }, optShow: {}})
-  },
-  mixins: [presenter(), header()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    isSingle: {
-      type: Boolean,
-      default: true
-    },
-    materOptCode: {
-      type: String,
-      default: '00'
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      tableRadio: null,
-      tableData: []
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    clickChange(item) {
-      this.tableRadio = item
-    },
-    open() {
-
-    },
-    handleSelectionChange(val, row) {
-      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)
-    },
-    submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged3', this.tableRadio)
-        return
-      }
-      this.rows = this.$refs.table.selection
-      if (this.rows.length <= 0) {
-        this.$message('请先勾选物料')
-        return
-      }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged3', this.rows)
-    }
-  }
-}
-</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/storage_manage/rawproduct/in/index.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/in/index.vue
deleted file mode 100644
index 43fb93ac..00000000
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/in/index.vue
+++ /dev/null
@@ -1,768 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <label class="el-form-item-label">单据编号</label>
-        <el-input
-          v-model="query.search"
-          clearable
-          placeholder="单据编号"
-          style="width: 185px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <rrOperation :crud="crud" />
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          :disabled="work_flag"
-          :loading="syncLoading"
-          icon="el-icon-position"
-          size="mini"
-          @click="genTask()"
-        >
-          生成任务
-        </el-button>
-      </crudOperation>
-      <!--表单组件-->
-      <el-dialog
-        :close-on-click-modal="false"
-        :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
-        :title="crud.status.title"
-        width="800px"
-      >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="单据类型" prop="bill_type">
-                <el-select
-                  v-model="form.bill_type"
-                  placeholder=""
-                  style="width: 200px"
-                >
-                  <el-option
-                    v-for="item in bill_types"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="所属工序" prop="workprocedure_id">
-                <el-select
-                  v-model="form.workprocedure_id"
-                  placeholder=""
-                  style="width: 200px"
-                  @change="selectStartPoint(form.workprocedure_id)"
-                >
-                  <el-option
-                    v-for="item in workprocedures"
-                    :key="item.workprocedure_id"
-                    :label="item.workprocedure_name"
-                    :value="item.workprocedure_id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item v-if="false" label="物料id">
-                <el-input v-model="form.material_id" style="width: 200px;" />
-              </el-form-item>
-              <el-form-item label="物料" prop="material_name">
-                <label slot="label">物&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;料</label>
-                <el-input v-model="form.material_name" style="width: 200px;" @focus="getMater" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="载具编码" prop="vehicle_code">
-                <el-input v-model="form.vehicle_code" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="数量">
-                <label slot="label">数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量</label>
-                <el-input v-model="form.qty" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="批次">
-                <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
-                <el-input v-model="form.pcsn" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="起始点位" prop="start_point_code">
-                <el-select
-                  v-model="form.start_point_code"
-                  placeholder=""
-                  style="width: 200px"
-                  clearable
-                  @change="getStartArea(form.start_point_code)"
-                >
-                  <el-option
-                    v-for="item in startPoints"
-                    :key="item.point_code"
-                    :label="item.point_name"
-                    :value="item.point_code"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item v-if="false" label="终点点位">
-                <el-input v-model="form.end_point_code" style="width: 200px;" />
-              </el-form-item>
-              <el-form-item label="终点点位" prop="end_point_name">
-                <el-input v-model="form.end_point_name" style="width: 200px;" @focus="getEndPoint(form.material_id,form.end_area,form.vehicle_code,form.qty)" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="起始区域">
-                <el-select
-                  v-model="form.start_area"
-                  placeholder=""
-                  style="width: 200px"
-                  disabled
-                >
-                  <el-option
-                    v-for="item in dict.sch_area_type"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="终点区域">
-                <el-select
-                  v-model="form.end_area"
-                  placeholder=""
-                  style="width: 200px"
-                  disabled
-                >
-                  <el-option
-                    v-for="item in dict.sch_area_type"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <!-- <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="客户名称">
-                <el-select v-model="form.cust_id" filterable clearable class="filter-item" style="width: 200px" placeholder="请选择客户">
-                  <el-option
-                    v-for="item in custList"
-                    :key="item.cust_id"
-                    :label="item.cust_name"
-                    :value="item.cust_id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="黏次">
-                <label slot="label">黏&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
-                <el-input v-model="form.mix_seq" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>-->
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item v-if="false" label="是否满托" prop="is_full">
-                <el-radio v-model="form.is_full" label="1">是</el-radio>
-                <el-radio v-model="form.is_full" label="0">否</el-radio>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item v-if="false" label="物料工序">
-                <el-select v-model="form.ivt_workprocedure_id" disabled filterable clearable class="filter-item" style="width: 200px">
-                  <el-option
-                    v-for="item in workprocedures"
-                    :key="item.workprocedure_id"
-                    :label="item.workprocedure_name"
-                    :value="item.workprocedure_id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="24">
-              <el-form-item label="备注">
-                <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
-                <el-input v-model="form.remark" :rows="3" type="textarea" style="width: 600px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--工序入库单详情查看-->
-      <el-dialog
-        :visible.sync="lookDialog"
-        title="工序入库单详情查看"
-        width="800px"
-      >
-        <el-form ref="form1" disabled :model="form1" :rules="rules" size="mini" label-width="120px">
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="单据类型" prop="bill_type">
-                <el-select
-                  v-model="form1.bill_type"
-                  placeholder=""
-                  style="width: 200px"
-                >
-                  <el-option
-                    v-for="item in bill_types"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="所属工序" prop="workprocedure_id">
-                <el-select
-                  v-model="form1.workprocedure_id"
-                  placeholder=""
-                  style="width: 200px"
-                  @change="selectStartPoint(form.workprocedure_id)"
-                >
-                  <el-option
-                    v-for="item in workprocedures"
-                    :key="item.workprocedure_id"
-                    :label="item.workprocedure_name"
-                    :value="item.workprocedure_id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item v-if="false" label="物料id">
-                <el-input v-model="form1.material_id" style="width: 200px;" />
-              </el-form-item>
-              <el-form-item label="物料" prop="material_name">
-                <label slot="label">物&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;料</label>
-                <el-input v-model="form1.material_name" style="width: 200px;" @focus="getMater" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="载具编码" prop="vehicle_code">
-                <el-input v-model="form1.vehicle_code" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="数量">
-                <label slot="label">数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量</label>
-                <el-input v-model="form1.qty" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="批次">
-                <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
-                <el-input v-model="form1.pcsn" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="起始点位">
-                <el-select
-                  v-model="form1.start_point_code"
-                  placeholder=""
-                  style="width: 200px"
-                  clearable
-                  @change="getStartArea(form.start_point_code)"
-                >
-                  <el-option
-                    v-for="item in startPoints"
-                    :key="item.point_code"
-                    :label="item.point_name"
-                    :value="item.point_code"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item v-if="false" label="终点点位">
-                <el-input v-model="form1.end_point_code" style="width: 200px;" />
-              </el-form-item>
-              <el-form-item label="终点点位">
-                <el-input v-model="form1.end_point_name" style="width: 200px;" @focus="getEndPoint" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="起始区域">
-                <el-select
-                  v-model="form1.start_area"
-                  placeholder=""
-                  style="width: 200px"
-                  disabled
-                >
-                  <el-option
-                    v-for="item in dict.sch_area_type"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="终点区域">
-                <el-select
-                  v-model="form1.end_area"
-                  placeholder=""
-                  style="width: 200px"
-                  disabled
-                >
-                  <el-option
-                    v-for="item in dict.sch_area_type"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <!--  <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="客户名称">
-                <el-select v-model="form1.cust_id" filterable clearable class="filter-item" style="width: 200px" placeholder="请选择客户">
-                  <el-option
-                    v-for="item in custList"
-                    :key="item.cust_id"
-                    :label="item.cust_name"
-                    :value="item.cust_id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="黏次">
-                <label slot="label">黏&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
-                <el-input v-model="form1.mix_seq" style="width: 200px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>-->
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="是否满托">
-                <el-radio v-model="form1.is_full" label="1">是</el-radio>
-                <el-radio v-model="form1.is_full" label="0">否</el-radio>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item v-if="false" label="物料工序">
-                <el-select v-model="form1.ivt_workprocedure_id" disabled filterable clearable class="filter-item" style="width: 200px">
-                  <el-option
-                    v-for="item in workprocedures"
-                    :key="item.workprocedure_id"
-                    :label="item.workprocedure_name"
-                    :value="item.workprocedure_id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="24">
-              <el-form-item label="备注">
-                <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
-                <el-input v-model="form1.remark" :rows="3" type="textarea" style="width: 600px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="lookDialog=false">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-        :cell-style="{'text-align':'center'}"
-        :header-cell-style="{'text-align':'center'}"
-        @selection-change="crud.selectionChangeHandler"
-        @current-change="handleCurrentChange"
-        @select="handleSelectionChange"
-        @select-all="onSelectAll"
-      >
-        <el-table-column :selectable="checkboxT" type="selection" width="55" />
-        <el-table-column prop="bill_code" label="单据编号" min-width="130" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-link type="warning" @click="lookUp(scope.row)">{{ scope.row.bill_code }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="bill_type" label="单据类型" width="100">
-          <template slot-scope="scope">
-            {{ dict.label.ST_INV_TYPE[scope.row.bill_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="bill_status" label="单据状态">
-          <template slot-scope="scope">
-            {{ dict.label.st_bill_status[scope.row.bill_status] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="workprocedure_name" label="所属工序" width="90" />
-        <el-table-column prop="material_name" label="物料"min-width="130" show-overflow-tooltip />
-        <el-table-column prop="vehicle_code" label="载具编码" width="120px" />
-        <el-table-column prop="pcsn" label="批次" />
-        <el-table-column v-if="false" prop="mix_seq" label="黏次" />
-        <el-table-column prop="qty" label="数量" width="100">
-          <template slot-scope="scope">
-            {{ fun(scope.row.qty) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="unit_name" label="数量单位" />
-        <el-table-column prop="start_point_name" label="起始点位" width="120" />
-        <el-table-column prop="start_area" label="起始区域" width="120">
-          <template slot-scope="scope">
-            {{ dict.label.sch_area_type[scope.row.start_area] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="end_point_name" label="终点点位" width="120" />
-        <el-table-column prop="end_area" label="终点区域" width="120">
-          <template slot-scope="scope">
-            {{ dict.label.sch_area_type[scope.row.end_area] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="cust_name" label="客户" />
-        <el-table-column prop="create_mode" label="生成方式">
-          <template slot-scope="scope">
-            {{ dict.label.ST_CREATE_MODE[scope.row.create_mode] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="task_id" label="任务标识" width="150" />
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="create_time" label="创建时间" width="150" />
-        <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" width="150" />
-        <el-table-column prop="confirm_optname" label="确认人" />
-        <el-table-column prop="confirm_time" label="确认时间" width="150" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-              :disabled-edit="canUd(scope.row)"
-              :disabled-dle="canUd(scope.row)"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-    <EndPointDialog :dialog-show.sync="endPointDialog" :open-param="openParam" :dialog-matertype="endPointType" @tableChanged2="tableChanged2" />
-    <MaterDialog :dialog-show.sync="materDialog" :dialog-matertype="materType" @tableChanged3="tableChanged3" />
-  </div>
-</template>
-
-<script>
-import crudWorkprocedureios from '@/api/wms/st/in/workprocedureios'
-import crudWorkprocedure from '@/api/wms/pdm/workprocedure'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import EndPointDialog from './EndPointDialog'
-import MaterDialog from './MaterDialog'
-import crudProducetask from '@/api/wms/pdm/producetask'
-
-const defaultForm = {
-  iostorinv_id: null,
-  bill_code: null,
-  io_type: null,
-  bill_type: null,
-  workprocedure_id: null,
-  material_id: null,
-  vehicle_code: null,
-  qty: null,
-  qty_unit_id: null,
-  bill_status: null,
-  start_point_code: null,
-  end_point_code: null,
-  start_area: null,
-  end_area: null,
-  cust_id: null,
-  create_mode: null,
-  task_id: null,
-  remark: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null,
-  confirm_optid: null,
-  confirm_optname: null,
-  confirm_time: null,
-  is_delete: null,
-  end_point_name: null,
-  material_name: null,
-  pcsn: null,
-  ivt_workprocedure_id: null,
-  is_full: '1',
-  mix_seq: ''
-}
-export default {
-  name: 'Workprocedureios',
-  dicts: ['sch_area_type', 'ST_CREATE_MODE', 'st_bill_status', 'ST_INV_TYPE'],
-  components: { pagination, crudOperation, rrOperation, udOperation, EndPointDialog, MaterDialog },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '工序入库',
-      url: 'api/workprocedureiosIn',
-      idField: 'iostorinv_id',
-      sort: 'iostorinv_id,desc',
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        download: false
-      },
-      crudMethod: { ...crudWorkprocedureios }
-    })
-  },
-  data() {
-    return {
-      form1: { iostorinv_id: null, bill_code: null, io_type: null, bill_type: null, workprocedure_id: null, material_id: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, start_area: null, end_area: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null, end_point_name: null, material_name: null, pcsn: null, ivt_workprocedure_id: null, is_full: null, mix_seq: '' },
-      endPointDialog: false,
-      work_flag: true,
-      materDialog: false,
-      bill_types: [],
-      workprocedures: [],
-      startPoints: [],
-      permission: {},
-      openParam: {},
-      endPointType: '',
-      materType: '',
-      currentRow: '',
-      custList: [],
-      syncLoading: false,
-      lookDialog: false,
-      rules: {
-        bill_type: [
-          { required: true, message: '单据类型不能为空', trigger: 'blur' }
-        ],
-        workprocedure_id: [
-          { required: true, message: '工序不能为空', trigger: 'blur' }
-        ],
-        material_name: [
-          { required: true, message: '物料不能为空', trigger: 'change' }
-        ],
-        vehicle_code: [
-          { required: true, message: '载具编码不能为空', trigger: 'blur' }
-        ],
-        start_point_code: [
-          { required: true, message: '起点点位不能为空', trigger: 'blur' }
-        ],
-        end_point_name: [
-          { required: true, message: '终点点位不能为空', trigger: 'change' }
-        ],
-        is_full: [
-          { required: true, message: '是否满托不能为空', trigger: 'blur' }
-        ]
-      },
-      queryTypeOptions: [
-        { key: 'bill_code', display_name: '单据编号' }
-      ]
-    }
-  },
-  created() {
-    this.getBillTypes()
-    this.queryWorkprocedure()
-    // this.getCust()
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    [CRUD.HOOK.afterToEdit]() {
-      const queryData = { // eslint-disable-line no-unused-vars
-        workprocedureid: this.form.workprocedure_id
-      }
-      crudWorkprocedureios.selectStartPoint(queryData).then(res => {
-        this.startPoints = res
-      })
-    },
-    [CRUD.HOOK.beforeSubmit]() {
-      return true
-    },
-    fun(val) {
-      return Number(val).toFixed(2)
-    },
-    getCust() {
-      crudProducetask.getCust().then(res => {
-        this.custList = res
-      })
-    },
-    canUd(row) {
-      return (row.bill_status !== '10')
-    },
-    getBillTypes() {
-      crudWorkprocedureios.getBillTypes().then(res => {
-        this.bill_types = res
-      })
-    },
-    queryWorkprocedure() {
-      crudWorkprocedure.queryWorkprocedure().then(res => {
-        this.workprocedures = res
-      })
-    },
-    async selectStartPoint(workprocedureid) {
-      this.form.start_point_code = null
-      this.form.start_area = null
-      this.form.end_area = null
-      this.form.end_point_code = null
-      this.form.end_point_name = null
-      this.form.ivt_workprocedure_id = workprocedureid
-      // eslint-disable-next-line no-unused-vars
-      const end_area = this.form.end_area
-      const queryData = { // eslint-disable-line no-unused-vars
-        workprocedureid: workprocedureid
-      }
-      await crudWorkprocedureios.selectStartPoint(queryData).then(res => {
-        this.startPoints = res
-      })
-      await crudWorkprocedureios.getEndAareaByworkprocedureId({ workprocedure_id: this.form.workprocedure_id }).then(res => {
-        if (end_area === '' || end_area === null || end_area === undefined) {
-          this.form.end_area = res.end_area
-        }
-        this.form.qty_unit_id = res.qty_unit_id
-      })
-    },
-    getStartArea(start_point_code) {
-      const queryData = { // eslint-disable-line no-unused-vars
-        start_point_code: start_point_code
-      }
-      crudWorkprocedureios.getStartArea(queryData).then(res => {
-        this.form.start_area = res.area_type
-      })
-    },
-    getEndPoint(material_id, end_area, vehicle_code, qty) {
-
-      const material = { material_id: material_id, area_type: end_area, vehicle_code: vehicle_code, qty: qty }
-      this.openParam = material
-      console.log(this.openParam)
-      this.endPointDialog = true
-    },
-    getMater() {
-      this.materDialog = true
-    },
-    tableChanged3(row) {
-      console.log(row)
-      this.form.material_id = row.material_id
-      this.form.material_name = row.material_name
-    },
-    tableChanged2(row) {
-      this.form.end_point_code = row.struct_code
-      this.form.end_point_name = row.struct_name
-      this.getEndArea(this.form.end_point_code)
-    },
-    getEndArea(end_point_code) {
-      const queryData = { // eslint-disable-line no-unused-vars
-        start_point_code: end_point_code
-      }
-      crudWorkprocedureios.getStartArea(queryData).then(res => {
-        this.form.end_area = res.area_type
-      })
-    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-        this.buttonChange(row)
-      } else if (val.length === 1) {
-        this.buttonChange(row)
-      } else {
-        this.handleCurrentChange(null)
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-      this.handleCurrentChange(null)
-    },
-    buttonChange(current) {
-      if (current !== null) {
-        this.currentRow = current
-        if (current.bill_status === '10') {
-          this.work_flag = false
-        } else {
-          this.work_flag = true
-        }
-      }
-    },
-    handleCurrentChange(current) {
-      if (current === null) {
-        this.work_flag = true
-        this.currentRow = {}
-      }
-    },
-    checkboxT(row) {
-      return row.bill_status !== '99'
-    },
-    genTask() {
-      this.syncLoading = true
-      crudWorkprocedureios.genTask({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(() => {
-        this.onSelectAll()
-        this.crud.toQuery()
-        this.handleCurrentChange(null)
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.syncLoading = false
-      })
-    },
-    lookUp(row) {
-      this.lookDialog = true
-      const obj = JSON.parse(JSON.stringify(row))
-      this.form1 = obj
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/out/MaterDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/out/MaterDialog.vue
deleted file mode 100644
index 0c9c0c58..00000000
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/out/MaterDialog.vue
+++ /dev/null
@@ -1,154 +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="模糊搜索">
-        <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="english_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 CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import pagination from '@crud/Pagination'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import crudWorkprocedureios from '@/api/wms/st/out/workprocedureiosOut'
-
-export default {
-  name: 'MaterDialog',
-  components: { rrOperation, pagination },
-  cruds() {
-    return CRUD({ title: '物料', url: 'api/workprocedureiosIn/getMaterial', crudMethod: { ...crudWorkprocedureios }, optShow: {}})
-  },
-  mixins: [presenter(), header()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    isSingle: {
-      type: Boolean,
-      default: true
-    },
-    materOptCode: {
-      type: String,
-      default: '00'
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      tableRadio: null,
-      tableData: []
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  methods: {
-    clickChange(item) {
-      this.tableRadio = item
-    },
-    open() {
-
-    },
-    handleSelectionChange(val, row) {
-      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)
-    },
-    submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged3', this.tableRadio)
-        return
-      }
-      this.rows = this.$refs.table.selection
-      if (this.rows.length <= 0) {
-        this.$message('请先勾选物料')
-        return
-      }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged3', this.rows)
-    }
-  }
-}
-</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/storage_manage/rawproduct/out/StartPointDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/out/StartPointDialog.vue
deleted file mode 100644
index fdf0fe58..00000000
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/out/StartPointDialog.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    width="1000px"
-    @close="close"
-    @open="open"
-  >
-    <span>起点点位列表:</span>
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      :data="crud.data"
-      style="width: 100%;"
-      size="mini"
-      border
-      :cell-style="{'text-align':'center'}"
-      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
-      @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="point_name" label="起点点位名称" min-width="110" show-overflow-tooltip />
-      <el-table-column prop="area_type" label="所属区域" width="150" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ dict.label.sch_area_type[scope.row.area_type] }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="material_name" label="物料名称" show-overflow-tooltip />
-      <el-table-column prop="pcsn" label="批次" show-overflow-tooltip />
-      <el-table-column prop="vehicle_code111" label="载具编码" show-overflow-tooltip />
-      <el-table-column prop="canuse_qty" label="可用数" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ fun(scope.row.canuse_qty) }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="frozen_qty" label="冻结数" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ fun(scope.row.frozen_qty) }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="ivt_qty" label="库存数" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ fun(scope.row.ivt_qty) }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="warehousing_qty" label="待入数" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ fun(scope.row.warehousing_qty) }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="unit_name" label="数量单位" show-overflow-tooltip />
-      <el-table-column prop="instorage_time" label="入库时间" show-overflow-tooltip />
-      <el-table-column prop="point_type" label="点位类型">
-        <template slot-scope="scope">
-          {{ dict.label.sch_point_type[scope.row.point_type] }}
-        </template>
-      </el-table-column>
-    </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 CRUD, { presenter, header } from '@crud/crud'
-import pagination from '@crud/Pagination'
-import crudWorkprocedureiosOut from '@/api/wms/st/out/workprocedureiosOut'
-
-export default {
-  name: 'StartPointDialog',
-  components: { pagination },
-  dicts: ['sch_area_type', 'sch_point_type'],
-  cruds() {
-    return CRUD({ title: '起始点位', url: 'api/workprocedureiosOut/getStartPoint', crudMethod: { ...crudWorkprocedureiosOut }, optShow: {}})
-  },
-  mixins: [presenter(), header()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    isSingle: {
-      type: Boolean,
-      default: true
-    },
-    openParam: {
-      type: Object,
-      default: null
-    }
-  },
-  data() {
-    return {
-      formInline: {
-        search: ''
-      },
-      tableRadio: '',
-      tableData: [],
-      dialogVisible: false,
-      material: {}
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-        this.material = this.openParam
-      }
-    }
-  },
-  methods: {
-    fun(val) {
-      return Number(val).toFixed(2)
-    },
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done()
-        })
-        .catch(_ => {
-        })
-    },
-    open() {
-      console.log(this.openParam)
-      this.query.material_id = this.openParam.material_id
-      this.query.is_full = this.openParam.is_full
-      this.query.ivt_workprocedure_id = this.openParam.ivt_workprocedure_id
-      this.crud.toQuery()
-    },
-    close() {
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-    },
-    submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        this.$emit('update:dialogShow', false)
-        this.$emit('tableChanged2', this.tableRadio)
-        return
-      }
-      this.rows = this.$refs.table.selection
-      if (this.rows.length <= 0) {
-        this.$message('请先选择起点点位')
-        return
-      }
-      this.crud.resetQuery(false)
-      this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged2', this.rows)
-    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-      } else {
-        this.checkrow = row
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-    },
-    clickChange(item) {
-      this.tableRadio = item
-    },
-    hand(value) {
-      this.crud.toQuery()
-    }
-  }
-}
-</script>
-
-<style scoped>
-.crud-opts2 {
-  padding: 4px 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-
-.crud-opts2 .crud-opts-right2 {
-  margin-left: auto;
-}
-
-.el-table_body tr.current-row>td {
-  background-color: #e9e500;
-}
-</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/out/index.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/out/index.vue
deleted file mode 100644
index b395514c..00000000
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/out/index.vue
+++ /dev/null
@@ -1,611 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <label class="el-form-item-label">单据编号</label>
-        <el-input v-model="query.bill_code" clearable placeholder="单据编号" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-        <rrOperation :crud="crud" />
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          :disabled="work_flag"
-          :loading="syncLoading"
-          icon="el-icon-position"
-          size="mini"
-          @click="genTask()"
-        >
-          生成任务
-        </el-button>
-      </crudOperation>
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="750px">
-        <el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="120px">
-          <el-form-item label="单据类型" prop="bill_type">
-            <el-select
-              v-model="form.bill_type"
-              placeholder=""
-              style="width: 200px"
-            >
-              <el-option
-                v-for="item in bill_types"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="工序名称" prop="workprocedure_id">
-            <el-select
-              v-model="form.workprocedure_id"
-              placeholder=""
-              style="width: 200px"
-              @change="selectEndPoint(form.workprocedure_id)"
-            >
-              <el-option
-                v-for="item in workprocedures"
-                :key="item.workprocedure_id"
-                :label="item.workprocedure_name"
-                :value="item.workprocedure_id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="false" label="物料id">
-            <el-input v-model="form.material_id" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="物料" prop="material_name">
-            <label slot="label">物&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;料</label>
-            <el-input v-model="form.material_name" style="width: 200px;" @focus="materDialog=true" />
-          </el-form-item>
-          <el-form-item label="是否满托" prop="is_full">
-            <el-radio v-model="form.is_full" label="1">是</el-radio>
-            <el-radio v-model="form.is_full" label="0">否</el-radio>
-          </el-form-item>
-          <el-form-item label="物料工序">
-            <el-select v-model="form.ivt_workprocedure_id" disabled placeholder="" style="width: 200px">
-              <el-option
-                v-for="item in allWorkprocedures"
-                :key="item.workprocedure_id"
-                :label="item.workprocedure_name"
-                :value="item.workprocedure_id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="数量">
-            <label slot="label">数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量</label>
-            <el-input v-model="form.qty" style="width: 200px;" disabled />
-          </el-form-item>
-          <el-form-item label="批次">
-            <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
-            <el-input v-model="form.pcsn" style="width: 200px;" disabled />
-          </el-form-item>
-          <el-form-item label="载具编码">
-            <el-input v-model="form.vehicle_code" style="width: 200px;" disabled />
-          </el-form-item>
-          <el-form-item v-if="false" label="起点点位编码">
-            <el-input v-model="form.start_point_code" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="起始点位" prop="start_point_name">
-            <el-input v-model="form.start_point_name" style="width: 200px;" @focus="getStartPoint(form.material_id,form.is_full,form.workprocedure_id)" />
-          </el-form-item>
-          <el-form-item label="终点点位" prop="end_point_code">
-            <el-select
-              v-model="form.end_point_code"
-              placeholder=""
-              style="width: 200px"
-              clearable
-              @change="getEndArea(form.end_point_code)"
-            >
-              <el-option
-                v-for="item in endPoints"
-                :key="item.point_code"
-                :label="item.point_name"
-                :value="item.point_code"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="起始区域">
-            <el-select
-              v-model="form.start_area"
-              placeholder=""
-              style="width: 200px"
-              disabled
-            >
-              <el-option
-                v-for="item in dict.sch_area_type"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="终点区域">
-            <el-select
-              v-model="form.end_area"
-              placeholder=""
-              style="width: 200px"
-              disabled
-            >
-              <el-option
-                v-for="item in dict.sch_area_type"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!-- <el-form-item label="客户名称">
-            <el-select v-model="form.cust_id" filterable clearable class="filter-item" style="width: 200px" placeholder="请选择客户">
-              <el-option
-                v-for="item in custList"
-                :key="item.cust_id"
-                :label="item.cust_name"
-                :value="item.cust_id"
-              />
-            </el-select>
-          </el-form-item>-->
-          <!--<el-form-item label="黏次">
-            <label slot="label">黏&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
-            <el-input v-model="form.mix_seq" style="width: 200px;" />
-          </el-form-item>-->
-          <el-form-item label="备注">
-            <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
-            <el-input v-model="form.remark" type="textarea" style="width: 530px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-
-      <!--查看详情表单组件-->
-      <el-dialog
-        :visible.sync="lookDialog"
-        title="工序出库单详情查看"
-        width="750px"
-      >
-        <el-form ref="form1" disabled inline :model="form1" :rules="rules" size="mini" label-width="120px">
-          <el-form-item label="单据类型" prop="bill_type">
-            <el-select
-              v-model="form1.bill_type"
-              placeholder=""
-              style="width: 200px"
-            >
-              <el-option
-                v-for="item in bill_types"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="工序名称" prop="workprocedure_id">
-            <el-select
-              v-model="form1.workprocedure_id"
-              placeholder=""
-              style="width: 200px"
-              @change="selectEndPoint(form.workprocedure_id)"
-            >
-              <el-option
-                v-for="item in workprocedures"
-                :key="item.workprocedure_id"
-                :label="item.workprocedure_name"
-                :value="item.workprocedure_id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item v-if="false" label="物料id">
-            <el-input v-model="form1.material_id" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="物料" prop="material_name">
-            <label slot="label">物&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;料</label>
-            <el-input v-model="form1.material_name" style="width: 200px;" @focus="materDialog=true" />
-          </el-form-item>
-          <el-form-item label="是否满托">
-            <el-radio v-model="form1.is_full" label="1">是</el-radio>
-            <el-radio v-model="form1.is_full" label="0">否</el-radio>
-          </el-form-item>
-          <el-form-item label="物料工序">
-            <el-select v-model="form1.ivt_workprocedure_id" disabled filterable clearable class="filter-item" style="width: 200px">
-              <el-option
-                v-for="item in allWorkprocedures"
-                :key="item.workprocedure_id"
-                :label="item.workprocedure_name"
-                :value="item.workprocedure_id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="载具编码" prop="vehicle_code">
-            <el-input v-model="form1.vehicle_code" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="数量">
-            <label slot="label">数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;量</label>
-            <el-input v-model="form1.qty" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="批次">
-            <label slot="label">批&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
-            <el-input v-model="form1.pcsn" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item v-if="false" label="起点点位编码">
-            <el-input v-model="form1.start_point_code" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="起始点位">
-            <el-input v-model="form1.start_point_name" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="终点点位">
-            <el-select
-              v-model="form1.end_point_code"
-              placeholder=""
-              style="width: 200px"
-              clearable
-              @change="getEndArea(form.end_point_code)"
-            >
-              <el-option
-                v-for="item in endPoints"
-                :key="item.point_code"
-                :label="item.point_name"
-                :value="item.point_code"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="起始区域">
-            <el-select
-              v-model="form1.start_area"
-              placeholder=""
-              style="width: 200px"
-              disabled
-            >
-              <el-option
-                v-for="item in dict.sch_area_type"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="终点区域">
-            <el-select
-              v-model="form1.end_area"
-              placeholder=""
-              style="width: 200px"
-              disabled
-            >
-              <el-option
-                v-for="item in dict.sch_area_type"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!--   <el-form-item label="客户名称">
-            <el-select v-model="form1.cust_id" filterable clearable class="filter-item" style="width: 200px" placeholder="请选择客户">
-              <el-option
-                v-for="item in custList"
-                :key="item.cust_id"
-                :label="item.cust_name"
-                :value="item.cust_id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="黏次">
-            <label slot="label">黏&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;次</label>
-            <el-input v-model="form1.mix_seq" style="width: 200px;" />
-          </el-form-item>-->
-          <el-form-item label="备注">
-            <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
-            <el-input v-model="form1.remark" type="textarea" style="width: 530px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="lookDialog=false">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-        :cell-style="{'text-align':'center'}"
-        :header-cell-style="{'text-align':'center'}"
-        @selection-change="crud.selectionChangeHandler"
-        @current-change="handleCurrentChange"
-        @select="handleSelectionChange"
-        @select-all="onSelectAll"
-      >
-        <el-table-column :selectable="checkboxT" type="selection" width="55" />
-        <el-table-column prop="bill_code" label="单据编号" width="140">
-          <template slot-scope="scope">
-            <el-link type="warning" @click="lookUp(scope.row)">{{ scope.row.bill_code }}</el-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="bill_type" label="单据类型" width="100">
-          <template slot-scope="scope">
-            {{ dict.label.ST_INV_TYPE[scope.row.bill_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="bill_status" label="单据状态">
-          <template slot-scope="scope">
-            {{ dict.label.st_bill_status[scope.row.bill_status] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="workprocedure_name" label="所属工序" width="90" />
-        <el-table-column prop="material_name" label="物料" min-width="130" show-overflow-tooltip />
-        <el-table-column prop="vehicle_code" label="载具编码" width="200" />
-        <el-table-column prop="pcsn" label="批次" />
-        <el-table-column prop="mix_seq" label="黏次" />
-        <el-table-column prop="qty" label="数量" width="100">
-          <template slot-scope="scope">
-            {{ fun(scope.row.qty) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="unit_name" label="数量单位" />
-        <el-table-column prop="start_point_name" label="起始点位" width="120" />
-        <el-table-column prop="start_area" label="起始区域" width="120">
-          <template slot-scope="scope">
-            {{ dict.label.sch_area_type[scope.row.start_area] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="end_point_name" label="终点点位" width="120" />
-        <el-table-column prop="end_area" label="终点区域" width="120">
-          <template slot-scope="scope">
-            {{ dict.label.sch_area_type[scope.row.end_area] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="cust_name" label="客户" />
-        <el-table-column prop="create_mode" label="生成方式">
-          <template slot-scope="scope">
-            {{ dict.label.ST_CREATE_MODE[scope.row.create_mode] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="task_id" label="任务标识" width="150" />
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="create_time" label="创建时间" width="150" />
-        <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" width="150" />
-        <el-table-column prop="confirm_optname" label="确认人" />
-        <el-table-column prop="confirm_time" label="确认时间" width="150" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-              :disabled-edit="canUd(scope.row)"
-              :disabled-dle="canUd(scope.row)"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-    <MaterDialog :dialog-show.sync="materDialog" :dialog-matertype="materType" @tableChanged3="tableChanged3" />
-    <StartPointDialog :dialog-show.sync="startPointDialog" :dialog-matertype="startPointType" :open-param="openParam" @tableChanged2="tableChanged2" />
-  </div>
-</template>
-
-<script>
-import crudWorkprocedureiosOut from '@/api/wms/st/out/workprocedureiosOut'
-import crudWorkprocedure from '@/api/wms/pdm/workprocedure.js'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import MaterDialog from './MaterDialog'
-import StartPointDialog from './StartPointDialog'
-import crudProducetask from '@/api/wms/pdm/producetask'
-
-const defaultForm = { iostorinv_id: null, bill_code: null, io_type: null, bill_type: null, workprocedure_id: null, material_id: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, start_area: null, end_area: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null, start_point_name: null, material_name: null, pcsn: null, ivt_workprocedure_id: null, is_full: '1', mix_seq: '' }
-export default {
-  name: 'WorkprocedureiosOut',
-  dicts: ['sch_area_type', 'ST_CREATE_MODE', 'st_bill_status', 'ST_INV_TYPE'],
-  components: { pagination, crudOperation, rrOperation, udOperation, MaterDialog, StartPointDialog },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({ title: '工序出库', url: 'api/workprocedureiosOut', idField: 'iostorinv_id', sort: 'iostorinv_id,desc', optShow: { add: true, edit: false, del: false, download: false }, crudMethod: { ...crudWorkprocedureiosOut }})
-  },
-  data() {
-    return {
-      form1: { iostorinv_id: null, bill_code: null, io_type: null, bill_type: null, workprocedure_id: null, material_id: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, start_area: null, end_area: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null, start_point_name: null, material_name: null, pcsn: null, ivt_workprocedure_id: null, is_full: null, mix_seq: '' },
-      permission: {
-      },
-      custList: [],
-      bill_types: [],
-      workprocedures: [],
-      allWorkprocedures: [],
-      endPoints: [],
-      materDialog: false,
-      materType: '',
-      startPointDialog: false,
-      startPointType: '',
-      openParam: {},
-      currentRow: '',
-      work_flag: true,
-      syncLoading: false,
-      lookDialog: false,
-      rules: {
-        bill_type: [
-          { required: true, message: '单据类型不能为空', trigger: 'blur' }
-        ],
-        workprocedure_id: [
-          { required: true, message: '工序名称不能为空', trigger: 'blur' }
-        ],
-        material_name: [
-          { required: true, message: '物料不能为空', trigger: 'change' }
-        ],
-        end_point_code: [
-          { required: true, message: '终点点位不能为空', trigger: 'blur' }
-        ],
-        start_point_name: [
-          { required: true, message: '起点点位不能为空', trigger: 'change' }
-        ],
-        is_full: [
-          { required: true, message: '是否满托不能为空', trigger: 'blur' }
-        ]
-      },
-      queryTypeOptions: [
-        { key: 'bill_code', display_name: '单据编号' }
-      ]
-    }
-  },
-  created() {
-    this.getBillTypes()
-    this.queryWorkprocedure()
-    /* this.getCust()*/
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    fun(val) {
-      return Number(val).toFixed(2)
-    },
-    canUd(row) {
-      return (row.bill_status !== '10')
-    },
-    getCust() {
-      crudProducetask.getCust().then(res => {
-        this.custList = res
-      })
-    },
-    getBillTypes() {
-      crudWorkprocedureiosOut.getBillTypes().then(res => {
-        this.bill_types = res
-      })
-    },
-    queryWorkprocedure() {
-      crudWorkprocedureiosOut.queryWorkprocedure().then(res => {
-        this.workprocedures = res
-      })
-      crudWorkprocedure.queryWorkprocedure().then(res => {
-        this.allWorkprocedures = res
-      })
-    },
-    getEndArea(end_point_code) {
-      const queryData = { // eslint-disable-line no-unused-vars
-        start_point_code: end_point_code
-      }
-      crudWorkprocedureiosOut.getEndArea(queryData).then(res => {
-        this.form.end_area = res.area_type
-      })
-    },
-    async selectEndPoint(workprocedureid) {
-      this.form.end_point_code = null
-      this.form.end_area = null
-      this.form.start_area = null
-      this.form.start_point_code = null
-      this.form.start_point_name = null
-      // this.form.ivt_workprocedure_id = workprocedureid
-      // eslint-disable-next-line no-unused-vars
-      const start_area = this.form.start_area
-      const queryData = { // eslint-disable-line no-unused-vars
-        workprocedureid: workprocedureid
-      }
-      await crudWorkprocedureiosOut.selectEndPoint(queryData).then(res => {
-        this.endPoints = res
-      })
-      await crudWorkprocedureiosOut.getEndAareaByworkprocedureId({ workprocedure_id: this.form.workprocedure_id }).then(res => {
-        if (start_area === '' || start_area === null || start_area === undefined) {
-          this.form.start_area = res.start_area
-        }
-        this.form.qty_unit_id = res.qty_unit_id
-      })
-      await crudWorkprocedureiosOut.getIvtWorkprocedureId(queryData).then(res => {
-        this.form.ivt_workprocedure_id = res.ivt_workprocedure_id
-      })
-    },
-    tableChanged3(row) {
-      this.form.material_id = row.material_id
-      this.form.material_name = row.material_name
-      this.form.start_point_code = null
-      this.form.start_point_name = null
-    },
-    getStartPoint(material_id, is_full, ivt_workprocedure_id) {
-      const material = { material_id: material_id, is_full: is_full, ivt_workprocedure_id: ivt_workprocedure_id }
-      this.openParam = material
-      console.log(this.openParam)
-      this.startPointDialog = true
-    },
-    tableChanged2(row) {
-      this.form.start_point_code = row.point_code
-      this.form.start_point_name = row.point_name
-      this.form.pcsn = row.pcsn
-      this.form.qty = row.canuse_qty
-      this.form.vehicle_code = row.vehicle_code111
-      this.getStartArea(this.form.start_point_code)
-    },
-    getStartArea(start_point_code) {
-      const queryData = { // eslint-disable-line no-unused-vars
-        start_point_code: start_point_code
-      }
-      crudWorkprocedureiosOut.getEndArea(queryData).then(res => {
-        this.form.start_area = res.area_type
-      })
-    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-        this.buttonChange(row)
-      } else if (val.length === 1) {
-        this.buttonChange(row)
-      } else {
-        this.handleCurrentChange(null)
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-      this.handleCurrentChange(null)
-    },
-    buttonChange(current) {
-      if (current !== null) {
-        this.currentRow = current
-        if (current.bill_status === '10') {
-          this.work_flag = false
-        } else {
-          this.work_flag = true
-        }
-      }
-    },
-    handleCurrentChange(current) {
-      if (current === null) {
-        this.work_flag = true
-        this.currentRow = {}
-      }
-    },
-    checkboxT(row) {
-      return row.bill_status !== '99'
-    },
-    genTask() {
-      this.syncLoading = true
-      crudWorkprocedureiosOut.genTask({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(() => {
-        this.onSelectAll()
-        this.crud.toQuery()
-        this.handleCurrentChange(null)
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.syncLoading = false
-      })
-    },
-    lookUp(row) {
-      this.lookDialog = true
-      const obj = JSON.parse(JSON.stringify(row))
-      this.form1 = obj
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue
new file mode 100644
index 00000000..ebb0d335
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog.vue
@@ -0,0 +1,348 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    :title="crud.status.title"
+    append-to-body
+    fullscreen
+    :before-close="crud.cancelCU"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+    width="1200px"
+    @open="open"
+    @close="close"
+  >
+    <el-row v-show="crud.status.cu > 0" :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
+      <el-form-item label="单据号" prop="bill_code">
+        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
+        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="仓库" prop="product_code">
+        <label slot="label">生产车间:</label>
+        <el-select
+          v-model="form.product_code"
+          clearable
+          class="filter-item"
+          style="width: 210px"
+          :disabled="crud.status.view > 0"
+        >
+          <el-option
+            v-for="item in dict.product_area"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="业务类型">
+        <el-select
+          v-model="form.bill_type"
+          clearable
+          size="mini"
+          placeholder="业务类型3"
+          class="filter-item"
+        >
+          <el-option
+            v-for="item in dict.ST_INV_IN_TYPE"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="bill_status">
+        <el-select
+          v-model="form.bill_status"
+          clearable
+          style="width: 210px"
+          placeholder="单据状态"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in dict.IO_BILL_STATUS"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="明细数" prop="detail_count">
+        <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
+        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="总重量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
+        <el-input-number
+          v-model="form.total_qty"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="业务日期" prop="biz_date">
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+      </el-form-item>
+    </el-form>
+
+    <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+    <div class="crud-opts2" style="margin-bottom: 5px;">
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="insertEvent()"
+        >
+          添加物料
+        </el-button>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="form.tableData"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="index" label="序号" width="55" align="center" />
+
+      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
+      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
+      <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
+      <el-table-column show-overflow-tooltip prop="pcsn" label="订单号">
+        <template slot-scope="scope">
+          <el-input
+            v-model="form.tableData[scope.$index].pcsn"
+            clearable
+            :controls="false"
+            controls-position="right"
+            size="small"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column show-overflow-tooltip prop="plan_qty" label="数量">
+        <template slot-scope="scope">
+          <el-input-number
+            v-model="form.tableData[scope.$index].plan_qty"
+            size="small"
+            :controls="false"
+            controls-position="right"
+            precision="3"
+            :min="0"
+            @change="changeQty"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
+        <template scope="scope">
+          <el-button
+            type="danger"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-delete"
+            @click.native.prevent="deleteRow(scope.$index, form.tableData)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <MaterDtl
+      :dialog-show.sync="materShow"
+      :is-single="false"
+      :mater-opt-code="materType"
+      @setMaterValue="tableChanged"
+    />
+
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { crud, form } from '@crud/crud'
+import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+import MaterDtl from '@/views/wms/pub/MaterDialog'
+
+const defaultForm = {
+  bill_code: '',
+  product_code: '',
+  bill_status: '10',
+  total_qty: '0',
+  detail_count: '0',
+  bill_type: '',
+  remark: '',
+  biz_date: new Date(),
+  create_mode: '',
+  tableData: []
+}
+
+export default {
+  name: 'AddDialog',
+  components: { MaterDtl },
+  mixins: [crud(), form(defaultForm)],
+  dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      materShow: false,
+      dtlShow: false,
+      opendtlParam: null,
+      materType: '03', // 关键成品
+      storlist: [],
+      billtypelist: [],
+      rules: {
+        product_code: [
+          { required: true, message: '生产车间不能为空', trigger: 'blur' }
+        ],
+        bill_type: [
+          { required: true, message: '业务类型不能为空', trigger: 'blur' }
+        ],
+        biz_date: [
+          { required: true, message: '业务日期不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      crudProductIn.queryStor().then(res => {
+        this.storlist = res
+      })
+    },
+    close() {
+      this.$emit('AddChanged')
+    },
+    [CRUD.HOOK.afterToEdit]() {
+      // 获取入库单明细
+      crudProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    [CRUD.HOOK.afterToView]() {
+      crudProductIn.getIODtl({ 'bill_code': this.form.bill_code }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+
+    [CRUD.HOOK.beforeSubmit]() {
+      // 提交前校验
+      if (this.form.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        const row = this.form.tableData[i]
+        if (!row.pcsn || !row.plan_qty) {
+          this.crud.notify('订单号、数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+      }
+    },
+    deleteRow(index, rows) {
+      const material_code = rows[index].material_code
+      let len = rows.length
+      while (len--) {
+        const obj = rows[len]
+        if (material_code === obj.material_code) {
+          const index = rows.indexOf(obj)
+          if (index > -1) { // 移除找到的指定元素
+            this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
+            rows.splice(index, 1)
+            this.form.detail_count = this.form.tableData.length
+          }
+        }
+      }
+    },
+    tableChanged(rows) {
+      // 对新增的行进行校验不能存在相同物料批次
+      rows.forEach((item) => {
+        let same_mater = true
+        this.form.tableData.forEach((row) => {
+          if (row.material_code === item.material_code) {
+            same_mater = false
+          }
+        })
+        if (same_mater) {
+          item.quality_scode = '01'
+          item.ivt_level = '01'
+          item.is_active = '1'
+          item.plan_qty = '1'
+          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
+          this.form.tableData.splice(-1, 0, item)
+        }
+      })
+      this.form.detail_count = this.form.tableData.length
+    },
+    insertEvent(row) {
+      this.materShow = true
+    },
+    changeQty() {
+      this.form.total_qty = 0
+      this.form.tableData.forEach((item) => {
+        this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 4px 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDtl.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDtl.vue
new file mode 100644
index 00000000..284db03e
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDtl.vue
@@ -0,0 +1,183 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    title="物料新增"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <date-range-picker v-model="query.createTime" class="date-item" value-format="yyyy-MM-dd" />
+        <el-input
+          v-model="query.bill_code"
+          clearable
+          size="mini"
+          placeholder="单据号"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <el-input
+          v-model="query.package_box_sn"
+          clearable
+          size="mini"
+          placeholder="箱号"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <el-input
+          v-model="query.container_name"
+          clearable
+          size="mini"
+          placeholder="子卷号"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <el-input
+          v-model="query.material_search"
+          clearable
+          size="mini"
+          placeholder="物料编码"
+          style="width: 230px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <el-input
+          v-model="query.sap_pcsn"
+          clearable
+          size="mini"
+          placeholder="sap批次"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <rrOperation />
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation />
+      <!--表格渲染-->
+      <el-table
+        ref="multipleTable"
+        v-loading="crud.loading"
+        :data="crud.data"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column show-overflow-tooltip width="150" prop="sale_order_name" label="订单号" />
+        <el-table-column show-overflow-tooltip width="150" prop="customer_name" label="客户编号" />
+        <el-table-column width="200" prop="customer_description" label="客户名称" />
+        <el-table-column show-overflow-tooltip prop="package_box_sn" width="250" label="箱号" />
+        <el-table-column show-overflow-tooltip width="100" prop="quanlity_in_box" label="箱内子卷数" />
+        <el-table-column show-overflow-tooltip width="150" prop="container_name" label="子卷号" />
+        <el-table-column show-overflow-tooltip width="150" prop="sap_pcsn" label="sap批次" />
+        <el-table-column show-overflow-tooltip width="150" prop="product_name" label="物料编码" />
+        <el-table-column show-overflow-tooltip width="170" prop="product_description" label="物料描述" />
+        <el-table-column show-overflow-tooltip prop="width" label="幅宽" />
+        <el-table-column show-overflow-tooltip prop="thickness" label="产品厚度" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+
+    <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 CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+
+const start = new Date()
+export default {
+  name: 'AddDtl',
+  components: { crudOperation, rrOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '用户',
+      url: '/api/in/rawAssist/getBillDtl',
+      crudMethod: {},
+      optShow: {
+        reset: true
+      }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    opendtlParam: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      rows: [],
+      tableData: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    [CRUD.HOOK.beforeRefresh]() {
+      this.crud.query.bill_type = '0001'
+      return true
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        if (rowIndex % 2 === 0) {
+          return {
+            rowspan: 2,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+    },
+    open() {
+      this.crud.toQuery()
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+
+      this.$emit('update:dialogShow', false)
+      this.rows = this.$refs.multipleTable.selection
+      crudProductIn.queryBoxMater(this.rows).then(res => {
+        this.rows = res
+        this.$emit('tableChanged', this.rows)
+      })
+      // this.form = this.$options.data().form
+    }
+  }
+}
+</script>
+
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog.vue
new file mode 100644
index 00000000..fd067d29
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog.vue
@@ -0,0 +1,527 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    fullscreen
+    @close="close"
+    @open="open"
+  >
+
+    <span slot="title" class="dialog-footer">
+      <div class="crud-opts2">
+        <span class="el-dialog__title2">入库分配</span>
+        <span class="crud-opts-right2">
+          <!--左侧插槽-->
+          <slot name="left" />
+          <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
+        </span>
+      </div>
+    </span>
+    <div class="crud-opts2">
+      <span class="role-span">入库明细项</span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="dtl_table"
+        :data="this.openParam"
+        style="width: 100%;"
+        max-height="300"
+        border
+        highlight-current-row
+        :row-class-name="tableRowClassName"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @row-click="clcikRow"
+      >
+        <el-table-column prop="bill_status" label="状态" align="center" width="110px">
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.bill_status"
+              class="filter-item"
+              :disabled="true"
+            >
+              <el-option
+                v-for="item in dict.IO_BILL_STATUS"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column show-overflow-tooltip prop="pcsn" label="订单号" align="center" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
+        <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
+      </el-table>
+    </el-card>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">
+      <el-form ref="form2" :inline="true" :model="form" :rules="rules" size="mini">
+        <el-form-item label="入库点" prop="point_code">
+          <el-select
+            v-model="form.point_code"
+            clearable
+            placeholder="请选择"
+            class="filter-item"
+            style="width: 200px;"
+          >
+            <el-option
+              v-for="item in pointlist"
+              :key="item.point_code"
+              :label="item.point_name"
+              :value="item.point_code"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <div class="crud-opts2">
+      <span class="role-span">载具物料明细</span>
+      <div class="crud-opts-form">
+        <el-form ref="form" :inline="true" :model="form" size="mini">
+          <el-form-item label="区域" prop="gender5">
+            <el-cascader
+              placeholder="请选择"
+              :options="sects"
+              :props="{ checkStrictly: true }"
+              clearable
+              @change="sectQueryChange"
+            />
+          </el-form-item>
+          <el-form-item prop="checked">
+            <el-checkbox v-model="form.checked">自动分配货位</el-checkbox>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="confirmvehicle()"
+        >
+          组盘确认
+        </el-button>
+        <el-button
+          slot="left"
+          :loading="divBtn"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="divStruct()"
+        >
+          分配货位
+        </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="unDivStruct()"
+        >
+          取消分配
+        </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-delete"
+          size="mini"
+          @click="divPoint()"
+        >
+          设置起点
+        </el-button>
+      </span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="dis_table"
+        :data="form.tableMater"
+        style="width: 100%;"
+        max-height="300"
+        border
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @row-click="clcikRowDis"
+      >
+        <el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column show-overflow-tooltip prop="pcsn" label="订单号" align="center" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
+        <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" align="center">
+          <template slot-scope="scope">
+            <el-input
+              v-model="form.tableMater[scope.$index].storagevehicle_code"
+              clearable
+              :controls="false"
+              controls-position="right"
+              size="small"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip prop="overstruct_type" label="载具超限" align="center">
+          <template slot-scope="scope">
+            <el-select
+              v-model="form.tableMater[scope.$index].overstruct_type"
+              clearable
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 100px;"
+            >
+              <el-option
+                v-for="item in dict.MD_OVERSTRUCT_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />
+        <el-table-column show-overflow-tooltip prop="struct_code" label="货位" align="center" />
+      </el-table>
+    </el-card>
+
+    <StructDiv ref="child" :stor-id="storId" :dialog-show.sync="structShow" :sect-prop="sectProp" @tableChanged="tableChanged" />
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { crud } from '@crud/crud'
+import StructDiv from '@/views/wms/pub/StructDialog'
+import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+import crudPoint from '@/api/wms/sch/point'
+import crudRegion from '@/api/wms/sch/region'
+
+export default {
+  name: 'DivDialog',
+  components: { StructDiv },
+  mixins: [crud()],
+  dicts: ['IO_BILL_STATUS', 'MD_OVERSTRUCT_TYPE'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    bussConfig: {
+      type: Object
+    },
+    openParam: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    billType: {
+      type: String,
+      default: null
+    },
+    storId: {
+      type: String,
+      default: null
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      stor_id: '',
+      sect_id: '',
+      sectProp: null,
+      bucketProp: {},
+      structShow: false,
+      bucketObj: null,
+      divBtn: false,
+      bucketShow: false,
+      sects: [],
+      sect_val: null,
+      dis_row: null,
+      form: {
+        dtl_row: null,
+        storage_qty: '',
+        sect_id: '',
+        stor_id: '',
+        point_code: null,
+        checked: true,
+        tableMater: []
+      },
+      storlist: [],
+      pointlist: [],
+      rules: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      crudRegion.getRegionSelect({ 'stor_id': this.storId }).then(res => {
+        this.sects = res.content
+      })
+      const area_type = 'A1_RK01'
+      crudPoint.getPoint({ 'area_type': area_type }).then(res => {
+        this.pointlist = res
+      })
+    },
+    toDelete(data) {
+      data.pop = true
+    },
+    close() {
+      this.form.tableMater = []
+      this.form.dtl_row = null
+      this.sectProp = null
+      this.$emit('update:dialogShow', false)
+      this.$emit('AddChanged')
+      this.crud.refresh()
+      this.$refs['form2'].resetFields()
+    },
+    clcikRow(row, column, event) {
+      this.form.dtl_row = row
+      crudProductIn.getIODtl({ 'iostorinv_id': this.form.dtl_row.iostorinv_id }).then(res => {
+        this.openParam = res
+        this.form.dtl_row = res[row.index]
+      })
+      crudProductIn.getDisDtl(row).then(res => {
+        this.form.tableMater = res
+      })
+    },
+    clcikRowDis(row, column, event) {
+      this.dis_row = row
+    },
+    vehicleCheck() {
+      if (!this.form.dtl_row) {
+        this.crud.notify('请选择一条入库明细', CRUD.NOTIFICATION_TYPE.INFO)
+        this.form.storagevehicle_code = ''
+        return
+      }
+      crudProductIn.checkVehicle({
+        'storagevehicle_code': this.form.storagevehicle_code,
+        'dis_num': this.form.tableMater.length,
+        'iostorinv_id': this.form.dtl_row.iostorinv_id
+      }).then(res => {
+
+      }).catch(err => {
+        this.form.storagevehicle_code = ''
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      row.index = rowIndex
+    },
+    insertvehicle() {
+      if (!this.form.dtl_row) {
+        this.crud.notify('请选择一条入库明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (!this.form.storagevehicle_code) {
+        this.crud.notify('请输入托盘号', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      // 判断是否选择了桶号
+      if (this.bucketObj) {
+        if (!(this.bucketObj.status === '01')) {
+          this.crud.notify('请校验桶状态！', CRUD.NOTIFICATION_TYPE.INFO)
+          return
+        }
+        const dis_dtl = JSON.parse(JSON.stringify(this.bucketObj))
+        // 判断选择的桶是否已经被选过
+        const flag = this.form.tableMater.some(mater => mater.bucketunique === dis_dtl.bucketunique)
+        if (!flag) {
+          const flag = this.form.tableMater.some(mater => mater.storagevehicle_code !== this.form.storagevehicle_code)
+          if (flag) {
+            this.crud.notify('存在不同载具号', CRUD.NOTIFICATION_TYPE.INFO)
+            return
+          }
+          dis_dtl.storagevehicle_code = this.form.storagevehicle_code
+          dis_dtl.pop = false
+          this.form.tableMater.splice(this.form.tableMater.length, 0, dis_dtl)
+          if (this.form.dtl_row.assign_qty) {
+            this.form.dtl_row.assign_qty = parseFloat(this.form.dtl_row.assign_qty) + parseFloat(this.form.storage_qty)
+          } else {
+            this.form.dtl_row.assign_qty = parseFloat(this.form.storage_qty)
+          }
+          if (parseFloat(this.form.dtl_row.unassign_qty) - parseFloat(this.form.storage_qty) > 0) {
+            this.form.dtl_row.unassign_qty = parseFloat(this.form.dtl_row.unassign_qty) - parseFloat(this.form.storage_qty)
+          } else {
+            this.form.dtl_row.unassign_qty = 0
+          }
+          this.openParam.splice(this.form.dtl_row.index, 1, this.form.dtl_row)
+        }
+        if (flag) {
+          this.crud.notify('该桶已被加入明细中', CRUD.NOTIFICATION_TYPE.INFO)
+        }
+      } else {
+        this.crud.notify('请选择桶号', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+    },
+    confirmvehicle() {
+      if (this.dis_row === null) {
+        this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.dis_row.overstruct_type === '') {
+        this.crud.notify('载具超限不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudProductIn.confirmvehicle(this.dis_row).then(res => {
+        crudProductIn.getIODtl({ 'iostorinv_id': this.form.dtl_row.iostorinv_id }).then(res => {
+          this.openParam = res
+        })
+        crudProductIn.getDisDtl(this.form.dtl_row).then(res => {
+          this.form.tableMater = res
+          this.crud.notify('组盘成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
+      })
+    },
+    sectQueryChange(val) {
+      this.sectProp = val
+      if (val.length === 1) {
+        this.stor_id = val[0]
+        this.sect_id = ''
+      }
+      if (val.length === 0) {
+        this.sect_id = ''
+        this.stor_id = ''
+      }
+      if (val.length === 2) {
+        this.stor_id = val[0]
+        this.sect_id = val[1]
+      }
+    },
+    tableChanged(row) {
+      this.form.sect_id = this.sect_id
+      this.form.stor_id = this.stor_id
+      // 新增一行物料时，给行进行赋值
+      for (let i = 0; i < this.form.tableMater.length; i++) {
+        this.form.tableMater[i].struct_id = row.point_id
+        this.form.tableMater[i].struct_code = row.point_code
+        this.form.tableMater[i].struct_name = row.point_name
+        this.form.tableMater[i].region_code = row.region_code
+        this.form.tableMater[i].region_name = row.region_name
+        this.form.tableMater.splice(i, 1, this.form.tableMater[i]) // 通过splice 替换数据 触发视图更新
+      }
+      crudProductIn.divStruct(this.form).then(res => {
+        crudProductIn.getIODtl({ 'iostorinv_id': this.form.dtl_row.iostorinv_id, 'open_flag': '1' }).then(res => {
+          this.openParam = res
+        })
+        this.form.tableMater = []
+      })
+    },
+    divPoint() {
+      if (!this.form.point_code) {
+        this.crud.notify('请选择入库点', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.form.tableMater.length === 0) {
+        this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudProductIn.divPoint(this.form).then(res => {
+        crudProductIn.getIODtl({ 'iostorinv_id': this.form.dtl_row.iostorinv_id, 'open_flag': '1' }).then(res => {
+          this.openParam = res
+        })
+        crudProductIn.getDisDtl(this.form.dtl_row).then(res => {
+          this.form.tableMater = res
+          this.crud.notify('设置起点成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
+      })
+    },
+    divStruct() {
+      if (this.dis_row === null) {
+        this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      // 如果勾选了，直接跳后台
+      if (this.form.checked) {
+        if (!this.sect_id) {
+          this.crud.notify('请先选择区域！', CRUD.NOTIFICATION_TYPE.INFO)
+          return
+        }
+        this.divBtn = true
+        this.form.sect_id = this.sect_id
+        this.form.stor_id = this.stor_id
+        this.form.is_pc = '1'
+        crudProductIn.divStruct(this.form).then(res => {
+          crudProductIn.getIODtl({ 'iostorinv_id': this.form.dtl_row.iostorinv_id, 'open_flag': '1' }).then(res => {
+            this.openParam = res
+          })
+          crudProductIn.getDisDtl(this.form.dtl_row).then(res => {
+            this.form.tableMater = res
+            this.divBtn = false
+            this.crud.notify('分配货位成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          })
+        }).finally(() => {
+          this.divBtn = false
+        })
+      } else {
+        this.structShow = true
+        this.$refs.child.getMsg(false)
+      }
+    },
+    unDivStruct() {
+      if (this.form.tableMater.length <= 0) {
+        this.crud.notify('不存在载具明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      const flag = this.form.tableMater.some(mater => !mater.struct_code)
+      if (flag) {
+        this.crud.notify('明细存在未分配货位！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      // 如果勾选了，直接跳后台
+      crudProductIn.unDivStruct(this.form).then(res => {
+        crudProductIn.getIODtl({ 'iostorinv_id': this.form.dtl_row.iostorinv_id, 'open_flag': '1' }).then(res => {
+          this.openParam = res
+        })
+        crudProductIn.getDisDtl(this.form.dtl_row).then(res => {
+          this.form.tableMater = res
+          this.crud.notify('取消分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size: 20px;
+  color: #303133;
+}
+
+.crud-opts2 .role-span {
+  padding: 10px 0px 10px 0px;
+}
+
+.crud-opts2 .crud-opts-form {
+  padding: 10px 0px 0px 20px;
+}
+
+.input-with-select {
+  background-color: #fff;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/ViewDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/ViewDialog.vue
new file mode 100644
index 00000000..5fb22527
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/ViewDialog.vue
@@ -0,0 +1,276 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    append-to-body
+    title="入库详情"
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    fullscreen
+    @close="close"
+    @open="open"
+  >
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
+      <el-form-item label="单据号" prop="bill_code">
+        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
+        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="生产车间">
+        <el-select
+          v-model="form.product_code"
+          clearable
+          size="mini"
+          placeholder="全部"
+          :disabled="true"
+          class="filter-item"
+          @change="crud.toQuery"
+        >
+          <el-option
+            v-for="item in dict.product_area"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="业务类型">
+        <el-select
+          v-model="form.bill_type"
+          clearable
+          filterable
+          size="mini"
+          :disabled="true"
+          placeholder="业务类型"
+          class="filter-item"
+          @change="crud.toQuery"
+        >
+          <el-option
+            v-for="item in dict.ST_INV_IN_TYPE"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="bill_status">
+        <el-select
+          v-model="form.bill_status"
+          clearable
+          style="width: 210px"
+          placeholder="单据状态"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in dict.IO_BILL_STATUS"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="明细数" prop="detail_count">
+        <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
+        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="总重量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
+        <el-input-number
+          v-model="form.total_qty"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="业务日期" prop="biz_date">
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="true" />
+      </el-form-item>
+    </el-form>
+    <div class="crud-opts2">
+      <span class="role-span2">入库明细</span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :data="tableDtl"
+        style="width: 100%;"
+        max-height="300"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="handleDtlCurrentChange"
+      >
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column prop="pcsn" label="订单号" width="150" align="center" />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column prop="qty_unit_name" label="单位" align="center" />
+        <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
+      </el-table>
+    </el-card>
+    <div class="crud-opts2">
+      <span class="role-span">作业明细</span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table2"
+        :data="tabledis"
+        style="width: 100%;"
+        max-height="300"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="handleDisCurrentChange"
+      >
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column prop="pcsn" label="订单号" align="center" width="150" />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column prop="point_code1" label="起始位置" align="center" />
+        <el-table-column prop="point_code2" label="目的位置" align="center" />
+        <el-table-column prop="task_code" label="任务号" align="center" />
+        <el-table-column prop="task_type_name" label="任务类型" align="center" width="150px" />
+      </el-table>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+
+import { crud } from '@crud/crud'
+import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+
+export default {
+  name: 'ViewDialog',
+  components: { },
+  mixins: [crud()],
+  dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    rowmst: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      tableDtl: [],
+      tabledis: [],
+      billtypelist: [],
+      storlist: [],
+      currentdtl: null,
+      currentDis: {},
+      form: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    rowmst: {
+      handler(newValue) {
+        this.form = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.queryTableDtl()
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+      this.currentDis = {}
+      this.currentdtl = null
+      this.tableDtl = []
+      this.tabledis = []
+      this.$emit('TaskChanged')
+    },
+    stateFormat(row, column) {
+      return this.dict.label.IO_BILL_STATUS[row.bill_status]
+    },
+    taskdtl_typeFormat(row) {
+      return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
+    },
+    task_statusFormat(row) {
+      return this.dict.label.task_status[row.task_status]
+    },
+    work_statusFormat(row) {
+      return this.dict.label.work_status[row.work_status]
+    },
+    handleDtlCurrentChange(current) {
+      if (current !== null) {
+        this.tabledis = []
+        this.currentdtl = current
+        this.queryTableDdis()
+      } else {
+        this.tabledis = []
+        this.currentdtl = {}
+      }
+    },
+    invtypeFormat(row, column) {
+      for (const item of this.billtypelist) {
+        if (item.code === row.source_bill_type) {
+          return item.name
+        }
+      }
+    },
+    handleDisCurrentChange(current) {
+      this.currentDis = current
+    },
+    queryTableDtl() {
+      crudProductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+        this.tableDtl = res
+      })
+    },
+    queryTableDdis() {
+      if (this.currentdtl !== null) {
+        crudProductIn.getDisTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
+          this.tabledis = res
+        }).catch(() => {
+          this.tabledis = []
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size:20px;
+  color:#303133;
+}
+
+.crud-opts2 .role-span2 {
+  padding: 0px 0px 20px 0px;
+}
+.crud-opts2 {
+  padding: 10px 0px 0px 50px;
+}
+
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/index.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/index.vue
new file mode 100644
index 00000000..c5e9bb30
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/index.vue
@@ -0,0 +1,322 @@
+<!--suppress ALL -->
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="模糊查询">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="单据号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="生产车间">
+            <el-select
+              v-model="query.product_code"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              clearable
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.IO_BILL_STATUS"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="业务类型">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="业务类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_IN_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          :disabled="dis_flag"
+          icon="el-icon-position"
+          size="mini"
+          @click="divOpen"
+        >
+          分配
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          :disabled="confirm_flag"
+          @click="confirm"
+        >
+          强制确认
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+        @current-change="handleCurrentChange"
+        @select="handleSelectionChange"
+        @select-all="onSelectAll"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
+          <template slot-scope="scope">
+            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.bill_code }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
+        <el-table-column prop="product_name" label="生产车间" width="130" show-overflow-tooltip />
+        <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" label="业务类型" :formatter="bill_typeFormat" />
+        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
+        <el-table-column label="明细数" align="center" prop="detail_count" />
+        <el-table-column label="总重量" align="center" prop="total_qty">
+          <template slot-scope="scope">
+            {{ fun(scope.row.total_qty) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="制单人" align="center" prop="create_name" />
+        <el-table-column label="制单时间" align="center" prop="create_time" width="150" />
+        <el-table-column label="修改人" align="center" prop="update_name" />
+        <el-table-column label="修改时间" align="center" prop="update_time" width="150" />
+        <el-table-column label="分配人" align="center" prop="dis_name" width="140px" />
+        <el-table-column label="分配时间" align="center" prop="dis_time" width="150" />
+        <el-table-column label="确认人" align="center" prop="confirm_name" width="150" />
+        <el-table-column label="确认时间" align="center" prop="confirm_time" width="150" />
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :disabled-edit="canUd(scope.row)"
+              :disabled-dle="canUd(scope.row)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <AddDialog @AddChanged="querytable" />
+    <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
+    <DivDialog :dialog-show.sync="divShow" :stor-id="storId" :open-param="openParam" @AddChanged="querytable" />
+  </div>
+</template>
+
+<script>
+import productIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import AddDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/AddDialog'
+import DivDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog'
+import ViewDialog from '@/views/wms/storage_manage/rawproduct/rawProductIn/ViewDialog'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'ProductIn',
+  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker, DivDialog },
+  cruds() {
+    return CRUD({
+      title: '',
+      optShow: { add: true, reset: true },
+      idField: 'iostorinv_id',
+      url: '/api/in/productIn',
+      crudMethod: { ...productIn }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['IO_BILL_STATUS', 'ST_INV_IN_TYPE', 'product_area'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {},
+      dis_flag: true,
+      confirm_flag: true,
+      disShow: false,
+      viewShow: false,
+      mstrow: {},
+      divShow: false,
+      openParam: [],
+      currentRow: null,
+      storlist: [],
+      storId: null
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudProductIn.queryStor().then(res => {
+      this.storlist = res
+    })
+  },
+  methods: {
+    fun(val) {
+      return Number(val).toFixed(3)
+    },
+    canUd(row) {
+      return row.bill_status !== '10'
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+        this.buttonChange(row)
+      } else if (val.length === 1) {
+        this.buttonChange(row)
+      } else {
+        this.handleCurrentChange(null)
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+      this.handleCurrentChange(null)
+    },
+    buttonChange(currentRow) {
+      if (currentRow !== null) {
+        this.currentRow = currentRow
+        if (currentRow.bill_status === '10' || currentRow.bill_status === '20' || currentRow.bill_status === '30') {
+          this.dis_flag = false
+        } else {
+          this.dis_flag = true
+        }
+        if (currentRow.bill_status === '30') {
+          this.confirm_flag = false
+        } else {
+          this.confirm_flag = true
+        }
+      }
+    },
+    handleCurrentChange(currentRow) {
+      if (currentRow === null) {
+        this.dis_flag = true
+        this.confirm_flag = true
+        this.currentRow = {}
+      }
+    },
+    bill_typeFormat(row, column) {
+      return this.dict.label.ST_INV_IN_TYPE[row.bill_type]
+    },
+    toView(row) {
+      this.mstrow = row
+      this.viewShow = true
+    },
+    confirm() {
+      if (!this.currentRow) {
+        this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudProductIn.confirm(this.currentRow).then(res => {
+        this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
+    stateFormat(row, column) {
+      return this.dict.label.IO_BILL_STATUS[row.bill_status]
+    },
+    divOpen() {
+      crudProductIn.getIODtl({ 'bill_code': this.currentRow.bill_code, 'open_flag': '1' }).then(res => {
+        this.openParam = res
+        debugger
+        this.storId = this.currentRow.product_code
+        this.billType = this.currentRow.bill_type
+        this.divShow = true
+      })
+    },
+    querytable() {
+      this.onSelectAll()
+      this.crud.toQuery()
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin.js b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin.js
new file mode 100644
index 00000000..f4b81144
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin.js
@@ -0,0 +1,192 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/in/productIn',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/in/productIn',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/in/productIn',
+    method: 'put',
+    data
+  })
+}
+
+export function getType(params) {
+  return request({
+    url: '/api/in/productIn/getType',
+    method: 'get',
+    params
+  })
+}
+
+export function getIODtl(data) {
+  return request({
+    url: '/api/in/productIn/getIODtl',
+    method: 'post',
+    data
+  })
+}
+
+export function insertDtl(data) {
+  return request({
+    url: '/api/in/productIn/insertDtl',
+    method: 'post',
+    data
+  })
+}
+
+export function commit(data) {
+  return request({
+    url: '/api/in/productIn/commit',
+    method: 'post',
+    data
+  })
+}
+
+export function checkVehicle(data) {
+  return request({
+    url: '/api/in/productIn/checkVehicle',
+    method: 'post',
+    data
+  })
+}
+
+export function confirmvehicle(data) {
+  return request({
+    url: '/api/in/productIn/confirmvehicle',
+    method: 'post',
+    data
+  })
+}
+
+export function getDisDtl(data) {
+  return request({
+    url: '/api/in/productIn/getDisDtl',
+    method: 'post',
+    data
+  })
+}
+
+export function divStruct(data) {
+  return request({
+    url: '/api/in/productIn/divStruct',
+    method: 'post',
+    data
+  })
+}
+
+export function unDivStruct(data) {
+  return request({
+    url: '/api/in/productIn/unDivStruct',
+    method: 'post',
+    data
+  })
+}
+
+export function divPoint(data) {
+  return request({
+    url: '/api/in/productIn/divPoint',
+    method: 'post',
+    data
+  })
+}
+
+export function bucketDtl(data) {
+  return request({
+    url: '/api/in/productIn/bucketDtl',
+    method: 'post',
+    data
+  })
+}
+
+export function updateTask(data) {
+  return request({
+    url: '/api/in/productIn/updateTask',
+    method: 'post',
+    data
+  })
+}
+
+export function confirmTask(data) {
+  return request({
+    url: '/api/in/productIn/confirmTask',
+    method: 'post',
+    data
+  })
+}
+
+export function confirm(data) {
+  return request({
+    url: '/api/in/productIn/confirm',
+    method: 'post',
+    data
+  })
+}
+
+export function delDis(data) {
+  return request({
+    url: '/api/in/productIn/delDis',
+    method: 'post',
+    data
+  })
+}
+
+export function queryBoxMater(data) {
+  return request({
+    url: '/api/in/productIn/queryBoxMater',
+    method: 'post',
+    data
+  })
+}
+
+export function queryStor() {
+  return request({
+    url: '/api/in/productIn/queryStor',
+    method: 'post'
+  })
+}
+
+export function getDisTask(data) {
+  return request({
+    url: '/api/in/productIn/getDisTask',
+    method: 'post',
+    data
+  })
+}
+
+export default {
+  add,
+  edit,
+  del,
+  getType,
+  insertDtl,
+  getIODtl,
+  commit,
+  checkVehicle,
+  confirmvehicle,
+  getDisDtl,
+  divStruct,
+  unDivStruct,
+  divPoint,
+  delDis,
+  queryBoxMater,
+  bucketDtl,
+  updateTask,
+  confirmTask,
+  confirm,
+  queryStor,
+  getDisTask
+}
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDialog.vue
new file mode 100644
index 00000000..1061c421
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDialog.vue
@@ -0,0 +1,387 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    title="出库单编辑"
+    append-to-body
+    fullscreen
+    :before-close="crud.cancelCU"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+    @open="open"
+    @close="close"
+  >
+    <el-row v-show="crud.status.cu > 0" :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
+      <el-form-item label="单据号" prop="bill_code">
+        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
+        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="生产车间" prop="product_code">
+        <label slot="label">生产车间:</label>
+        <el-select
+          v-model="form.product_code"
+          clearable
+          placeholder="生产车间"
+          class="filter-item"
+          style="width: 210px"
+          :disabled="crud.status.view > 0"
+          @change="storChange"
+        >
+          <el-option
+            v-for="item in dict.product_area"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="业务类型" prop="bill_type">
+        <el-select
+          v-model="form.bill_type"
+          clearable
+          filterable
+          size="mini"
+          placeholder="业务类型"
+          class="filter-item"
+        >
+          <el-option
+            v-for="item in dict.bill_type"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="bill_status">
+        <el-select
+          v-model="form.bill_status"
+          clearable
+          style="width: 210px"
+          placeholder="单据状态"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in dict.IO_BILL_STATUS"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="明细数" prop="detail_count">
+        <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
+        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="总重量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
+        <el-input-number
+          v-model="form.total_qty"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="业务日期" prop="biz_date">
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+      </el-form-item>
+    </el-form>
+
+    <div class="crud-opts2">
+      <span class="role-span">出库明细</span>
+      <span v-if="crud.status.cu > 0" class="crud-opts-right2">
+
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="queryDtl()"
+        >
+          添加物料
+        </el-button>
+        <!--   <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="insertdtl()"
+        >
+          新增一行
+        </el-button>-->
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="form.tableData"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
+        <!-- <template scope="scope">
+          <el-input v-show="!scope.row.edit" v-model="scope.row.material_code" disabled class="input-with-select">
+            <el-button slot="append" icon="el-icon-search" @click="queryMater(scope.$index, scope.row)" />
+          </el-input>
+          <span v-show="scope.row.edit">{{ scope.row.material_code }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
+      <el-table-column prop="material_spec" label="物料规格" align="center" min-width="150px" show-overflow-tooltip />
+      <el-table-column show-overflow-tooltip prop="pcsn" label="订单号" width="150px" align="center">
+        <!--   <template scope="scope">
+          <el-input v-show="!scope.row.edit" v-model="scope.row.pcsn" size="mini" />
+          <span v-show="scope.row.edit">{{ scope.row.pcsn }}</span>
+        </template>-->
+      </el-table-column>
+      <el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
+        <template scope="scope">
+          <el-input-number v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
+          <!--          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
+        </template>
+      </el-table-column>
+      <el-table-column prop="qty_unit_name" label="单位" align="center" />
+      <!--   <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
+        <template scope="scope">
+          <el-input v-model="scope.row.remark" size="mini" />
+          <span>{{ scope.row.remark }}</span>
+        </template>
+      </el-table-column>-->
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
+        <template scope="scope">
+          <el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged5" />
+    <MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @setMaterValue="setMaterValue" />
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { crud, form } from '@crud/crud'
+import AddDtl from '@/views/wms/storage_manage/product/productOut/AddDtl'
+import MaterDialog from '@/views/wms/pub/MaterDialog'
+import productOut from '@/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout'
+import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+
+const defaultForm = {
+  bill_code: '',
+  stor_id: '',
+  stor_code: '',
+  stor_name: '',
+  bill_status: '10',
+  total_qty: '0',
+  detail_count: '0',
+  bill_type: '',
+  remark: '',
+  biz_date: new Date(),
+  out_stor_id: '',
+  create_mode: '',
+  tableData: []
+}
+export default {
+  name: 'AddDialog',
+  components: { AddDtl, MaterDialog },
+  mixins: [crud(), form(defaultForm)],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area'],
+  data() {
+    return {
+      dialogVisible: false,
+      dtlShow: false,
+      materType: '',
+      materShow: false,
+      flagnow: false,
+      nowrow: {},
+      nowindex: '',
+      storlist: [],
+      inStorList: [],
+      invtypelist: [],
+      storId: null,
+      rules: {
+        product_code: [
+          { required: true, message: '生产车间不能为空', trigger: 'blur' }
+        ],
+        bill_type: [
+          { required: true, message: '业务类型不能为空', trigger: 'blur' }
+        ],
+        biz_date: [
+          { required: true, message: '业务日期不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      crudProductIn.queryStor().then(res => {
+        this.storlist = res
+      })
+    },
+    close() {
+      this.$emit('AddChanged')
+    },
+    [CRUD.HOOK.beforeSubmit]() {
+      if (this.form.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+    },
+    [CRUD.HOOK.afterToEdit]() {
+      productOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        /*   for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          row.edit = false
+          this.form.tableData.splice(i, 1, row)
+        }*/
+      })
+    },
+    [CRUD.HOOK.afterToView]() {
+      productOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          row.edit = true
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    invtypeFormat(row, column) {
+      return this.dict.label.bill_type[row.source_bill_type]
+    },
+    storChange(row) {
+      this.storlist.forEach((item) => {
+        if (item.product_code === row) {
+          this.form.product_code = item.product_code
+        }
+      })
+    },
+    async queryMater(index, row) {
+      if (this.form.bill_type === '') {
+        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.materShow = true
+      this.nowindex = index
+      this.nowrow = row
+    },
+    queryDtl(index, row) {
+      if (this.form.bill_type === '') {
+        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.form.product_code === '') {
+        this.crud.notify('请选择生产车间！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.storId = this.form.product_code
+      this.dtlShow = true
+    },
+    tableChanged5(rows) {
+      rows.forEach((item) => {
+        if (this.form.tableData.length !== 0) {
+          this.flagnow = false
+          for (let i = 0; i < this.form.tableData.length; i++) {
+            if (this.form.tableData[i].material_id === item.material_id && this.form.tableData[i].pcsn === item.pcsn) {
+              this.flagnow = true
+            }
+          }
+          if (!this.flagnow) {
+            item.edit = true
+            this.form.tableData.splice(-1, 0, item)
+            this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
+          }
+        } else {
+          item.edit = true
+          this.form.tableData.splice(-1, 0, item)
+          this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.plan_qty)
+        }
+      })
+      this.form.detail_count = this.form.tableData.length
+    },
+    setMaterValue(row) {
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        if (this.form.tableData[i].material_id === row.material_id) {
+          this.crud.notify('不允许添加相同物料！')
+          return false
+        }
+      }
+      this.nowrow.material_id = row.material_id
+      this.nowrow.material_code = row.material_code
+      this.nowrow.material_name = row.material_name
+      this.nowrow.qty_unit_id = row.base_unit_id
+      this.nowrow.qty_unit_name = row.unit_name
+      this.nowrow.plan_qty = '1'
+      this.nowrow.edit = false
+      this.form.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
+    },
+    async insertdtl() {
+      if (this.form.bill_type === '') {
+        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.form.tableData.push({ material_id: '', material_code: '', material_name: '', pcsn: '', quality_scode: '00', plan_qty: '1', qty_unit_name: '', qty_unit_id: '', remark: '', edit: false })
+      this.form.detail_count = this.form.tableData.length
+    },
+    deleteRow(index, rows) {
+      this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].plan_qty)
+      rows.splice(index, 1)
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+  padding: 4px 4px;
+}
+.input-with-select  {
+  background-color: #fff;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDtl.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDtl.vue
new file mode 100644
index 00000000..09bc1ce8
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDtl.vue
@@ -0,0 +1,164 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    title="物料选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <div class="head-container">
+      <div>
+        <!-- 搜索 -->
+        <el-input
+          v-model="query.material_code"
+          clearable
+          size="mini"
+          placeholder="物料编码、名称"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <el-input
+          v-model="query.material_spec"
+          clearable
+          size="mini"
+          placeholder="物料规格"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <el-input
+          v-model="query.pcsn"
+          clearable
+          size="mini"
+          placeholder="订单号"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+        <rrOperation />
+      </div>
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="multipleTable"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column prop="instorage_time" label="入库日期" :min-width="flexWidth('instorage_time',crud.data,'入库日期')" />
+      <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+      <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+      <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_name',crud.data,'物料规格')" />
+      <el-table-column prop="struct_code" label="点位" :min-width="flexWidth('struct_name',crud.data,'点位')" />
+      <el-table-column prop="pcsn" label="订单号" :min-width="flexWidth('pcsn',crud.data,'订单号')" />
+      <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="可用数" />
+      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
+      <el-button slot="left" type="primary" @click="submit">保存</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+
+export default {
+  name: 'AddDtl',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({
+      title: '用户', url: 'api/productOut/addDtl',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      },
+      query: {
+
+      }
+    })
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    },
+    storId: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      opendtlParam: '',
+      rows: [],
+      openShow: true
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    [CRUD.HOOK.beforeRefresh]() {
+      this.crud.query.mater_type = this.opendtlParam
+      this.crud.query.stor_id = this.storId
+      if (this.openShow) {
+        this.openShow = false
+        return false
+      } else {
+        return true
+      }
+    },
+    close() {
+      this.crud.resetQuery(false)
+      // 清空grid数据
+      this.crud.data = undefined
+      this.$emit('update:dialogShow', false)
+    },
+    open() {
+      this.crud.query.mater_type = this.opendtlParam
+    },
+    submit() {
+      this.rows = this.$refs.multipleTable.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选物料')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+    }
+  }
+}
+</script>
+
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/DivDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/DivDialog.vue
new file mode 100644
index 00000000..41fad6c7
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/DivDialog.vue
@@ -0,0 +1,581 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    fullscreen
+    @close="close"
+    @open="open"
+  >
+
+    <span slot="title" class="dialog-footer">
+      <div class="crud-opts2">
+        <span class="el-dialog__title2">出库分配</span>
+        <span class="crud-opts-right2">
+          <!--左侧插槽-->
+          <slot name="left" />
+          <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
+        </span>
+      </div>
+    </span>
+    <div class="crud-opts2">
+      <span class="role-span">出库明细</span>
+      <div class="crud-opts-form">
+        <el-form ref="form" :inline="true" :model="form" size="mini">
+          <el-form-item label="生产车间" prop="gender2">
+            <el-cascader
+              placeholder="请选择"
+              :options="sects"
+              :props="{ checkStrictly: true }"
+              clearable
+              @change="sectQueryChange"
+            />
+          </el-form-item>
+        </el-form>
+      </div>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          :loading="loadingAlldiv"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="allDiv()"
+        >
+          全部分配
+        </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="allCancel()"
+        >
+          全部取消
+        </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          :loading="loadingAutodiv"
+          type="primary"
+          icon="el-icon-check"
+          size="mini"
+          :disabled="button1"
+          @click="oneDiv()"
+        >
+          自动分配
+        </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-check"
+          size="mini"
+          :disabled="button2"
+          @click="oneCancel()"
+        >
+          自动取消
+        </el-button>
+        <!-- <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="button3"
+          @click="openStructIvt"
+        >
+          手工分配
+        </el-button>-->
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="warning"
+          :loading="loadingSetAllPoint"
+          icon="el-icon-check"
+          size="mini"
+          @click="allSetPointAllDtl"
+        >
+          一键设置
+        </el-button>
+      </span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :data="tableDtl"
+        style="width: 100%;"
+        max-height="300"
+        border
+        :cell-style="cellStyle"
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="handleDtlCurrentChange"
+      >
+        <el-table-column prop="bill_status" label="状态" align="center" width="110px" :formatter="bill_statusFormat" />
+        <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column show-overflow-tooltip prop="pcsn" label="订单号" align="center" width="140px" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" align="center" />
+        <el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />
+        <el-table-column show-overflow-tooltip prop="unassign_qty" label="未分配重量" :formatter="crud.formatNum3" align="center" />
+      </el-table>
+    </el-card>
+    <div class="crud-opts2">
+      <span class="role-span">分配明细</span>
+      <div class="crud-opts-form">
+        <el-form ref="form2" :inline="true" :model="form2" size="mini">
+          <el-form-item label="待分配" prop="unassign_qty">
+            <el-input-number
+              v-model="form2.unassign_qty"
+              :controls="false"
+              :precision="3"
+              :min="0"
+              disabled
+            />
+          </el-form-item>
+          <el-form-item label="已分配" prop="assign_qty">
+            <el-input-number
+              v-model="form2.assign_qty"
+              :controls="false"
+              :precision="3"
+              :min="0"
+              disabled
+            />
+          </el-form-item>
+          <!--   <el-form-item label="出库点" prop="point_code">
+            <el-select
+              v-model="form2.point_code"
+              clearable
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 200px;"
+            >
+              <el-option
+                v-for="item in this.pointList"
+                :key="item.point_code"
+                :label="item.point_name"
+                :value="item.point_code"
+              />
+            </el-select>
+          </el-form-item>-->
+        </el-form>
+      </div>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <!--      <el-button
+          slot="left"
+          class="filter-item"
+          :loading="loadingSetPoint"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          :disabled="button4"
+          @click="oneSetPoint2"
+        >
+          设置站点
+        </el-button>-->
+        <el-button
+          slot="left"
+          class="filter-item"
+          :loading="loadingSetAllPoint"
+          type="warning"
+          icon="el-icon-check"
+          :disabled="button5"
+          size="mini"
+          @click="allSetPoint"
+        >
+          一键设置
+        </el-button>
+      </span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table2"
+        :data="tabledis"
+        style="width: 100%;"
+        max-height="400"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="handleDisCurrentChange"
+      >
+        <el-table-column prop="bill_status" label="状态" align="center" width="110px">
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.work_status"
+              class="filter-item"
+              :disabled="true"
+            >
+              <el-option
+                v-for="item in dict.work_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="material_code" label="物料编码" width="150px" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+        <el-table-column prop="material_name" label="物料名称" width="250px" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+        <el-table-column prop="material_spec" label="物料规格" width="150px" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
+        <el-table-column prop="pcsn" label="订单号" width="150px" :min-width="flexWidth('pcsn',crud.data,'订单号')" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" label="出库重量" :formatter="crud.formatNum3" align="center" />
+        <el-table-column show-overflow-tooltip prop="struct_code" width="150px" label="点位编码" align="center" />
+        <el-table-column show-overflow-tooltip prop="struct_name" width="150px" label="点位名称" align="center" />
+        <el-table-column show-overflow-tooltip prop="task_code" width="150px" label="任务号" align="center" />
+        <el-table-column show-overflow-tooltip prop="point_code" width="150px" label="出库点" align="center" />
+      </el-table>
+    </el-card>
+    <StructIvt :dialog-show.sync="structshow" :stor-id="storId" :open-array="openParam" :rowmst="openRow" @StructIvtClosed="queryTableDtl" />
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { crud } from '@crud/crud'
+import productOut from '@/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout'
+import StructIvt from '@/views/wms/storage_manage/rawproduct/rawProductOut/StructIvt'
+import crudRegion from '@/api/wms/sch/region'
+import crudPoint from '@/api/wms/sch/point'
+
+export default {
+  name: 'DivDialog',
+  components: { StructIvt },
+  mixins: [crud()],
+  dicts: ['IO_BILL_STATUS', 'work_status'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    rowmst: {
+      type: Object
+    },
+    openArray: {
+      type: Array,
+      default: () => { return [] }
+    },
+    storId: {
+      type: String,
+      default: null
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      loadingAlldiv: false,
+      loadingAutodiv: false,
+      loadingSetPoint: false,
+      loadingSetAllPoint: false,
+      areatype: '',
+      typedisable: false,
+      pointshow: false,
+      structshow: false,
+      button1: true,
+      button2: true,
+      button3: true,
+      button4: true,
+      button5: true,
+      tableDtl: [],
+      openParam: [],
+      mstrow: {},
+      openRow: {},
+      tabledis: [],
+      currentRow: {},
+      currentDis: {},
+      form: {
+        gender2: ''
+      },
+      form2: {
+        unassign_qty: '0',
+        assign_qty: '0',
+        point_code: ''
+      },
+      sects: [],
+      invtypelist: [],
+      pointList: [],
+      rules: {
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openArray: {
+      handler(newValue, oldValue) {
+        this.tableDtl = newValue
+      }
+    },
+    rowmst: {
+      handler(newValue, oldValue) {
+        this.mstrow = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      crudRegion.getRegionSelect({ 'stor_id': this.storId }).then(res => {
+        this.sects = res.content
+      })
+
+      const area_type = 'A1_CK01'
+      crudPoint.getPoint({ 'area_type': area_type }).then(res => {
+        this.pointList = res
+      })
+    },
+    close() {
+      this.$refs['form2'].resetFields()
+      this.tabledis = []
+      this.$emit('DivChanged')
+      this.$emit('update:dialogShow', false)
+    },
+    bill_statusFormat(row, column) {
+      return this.dict.label.IO_BILL_STATUS[row.bill_status]
+    },
+    quality_scodeFormat(row, column) {
+      return this.dict.label.ST_QUALITY_SCODE[row.quality_scode]
+    },
+    invtypeFormat(row, column) {
+      for (const item of this.invtypelist) {
+        if (item.code === row.source_bill_type) {
+          return item.name
+        }
+      }
+    },
+    openPoint() {
+      if (this.mstrow.bill_type === '010101') {
+        this.areatype = "'31'"
+      } else if (this.mstrow.bill_type === '010201' || this.mstrow.bill_type === '010202' || this.mstrow.bill_type === '010401') {
+        this.areatype = "'21'"
+      } else if (this.mstrow.bill_type === '010503' || this.mstrow.bill_type === '010501') {
+        this.areatype = "'22','23','24'"
+      } else if (this.mstrow.bill_type === '010502') {
+        this.areatype = "'21','22','23','24'"
+      } else if (this.mstrow.bill_type === '010801') {
+        this.areatype = "'22','23','24','31','35'"
+      } else if (this.mstrow.bill_type === '010601') {
+        this.areatype = ''
+      }
+      this.pointshow = true
+      this.$refs.child.getMsg(this.areatype)
+    },
+    PointChanged(row) {
+      this.form2.point_code = row.point_code
+    },
+    openStructIvt() {
+      this.currentRow.remark = ''
+      this.currentRow.stor_id = this.storId
+      productOut.getStructIvt(this.currentRow).then(res => {
+        this.openParam = res
+        this.structshow = true
+        this.openRow = this.currentRow
+      })
+    },
+    sectQueryChange(val) {
+      if (val.length === 1) {
+        this.mstrow.stor_id = val[0]
+        this.mstrow.sect_id = ''
+      }
+      if (val.length === 0) {
+        this.mstrow.sect_id = ''
+        this.mstrow.stor_id = ''
+      }
+      if (val.length === 2) {
+        this.mstrow.stor_id = val[0]
+        this.mstrow.sect_id = val[1]
+      }
+    },
+    tabledisabled(row) {
+      if ((row.work_status === '00' || row.work_status === '01') && row.is_issued === '0') {
+        return false
+      } else {
+        return true
+      }
+    },
+    deleteRow(row) {
+      productOut.oneCancel(row).then(res => {
+        this.queryTableDtl()
+      })
+    },
+    handleDtlCurrentChange(current) {
+      if (current !== null) {
+        this.currentRow = current
+        this.form2.unassign_qty = current.unassign_qty
+        this.form2.assign_qty = current.assign_qty
+        this.tabledis = []
+        if (current.bill_status === '10') {
+          this.button1 = false
+          this.button2 = true
+          this.button5 = false
+          this.button3 = false
+        } else if (current.bill_status === '20') {
+          this.button1 = false
+          this.button2 = false
+          this.button3 = false
+          this.button5 = false
+        } else if (current.bill_status === '30') {
+          this.button1 = true
+          this.button2 = false
+          this.button3 = true
+          this.button5 = false
+        }
+        this.queryTableDdis(current.iostorinvdtl_id)
+      } else {
+        this.button1 = true
+        this.button2 = true
+        this.button3 = true
+        this.button5 = true
+        this.mstrow.iostorinvdtl_id = ''
+        this.currentRow = {}
+        this.tabledis = []
+      }
+    },
+    handleDisCurrentChange(current) {
+      if (current !== null) {
+        this.currentDis = current
+        if (current.work_status === '01' || current.work_status === '00') {
+          this.button4 = false
+        } else {
+          this.button4 = true
+        }
+      } else {
+        this.button4 = true
+        this.mstrow.iostorinvdis_id = ''
+        this.currentDis = {}
+      }
+    },
+    allDiv() {
+      this.loadingAlldiv = true
+      productOut.allDiv(this.mstrow).then(res => {
+        this.crud.notify('分配成功！', CRUD.NOTIFICATION_TYPE.INFO)
+        this.queryTableDtl()
+        this.loadingAlldiv = false
+      }).catch(() => {
+        this.loadingAlldiv = false
+      })
+    },
+    oneDiv() {
+      this.loadingAutodiv = true
+      if (this.currentRow.iostorinvdtl_id !== null) {
+        this.mstrow.iostorinvdtl_id = this.currentRow.iostorinvdtl_id
+        productOut.allDivOne(this.mstrow).then(res => {
+          this.queryTableDtl()
+          this.loadingAutodiv = false
+        }).catch(() => {
+          this.loadingAutodiv = false
+        })
+      }
+    },
+    allCancel() {
+      productOut.allCancel(this.mstrow).then(res => {
+        this.queryTableDtl()
+      })
+    },
+    oneCancel() {
+      if (this.currentRow.iostorinvdtl_id !== null) {
+        productOut.allCancel(this.currentRow).then(res => {
+          this.queryTableDtl()
+        })
+      }
+    },
+    allSetPoint() {
+    /*  if (this.form2.point_code === '') {
+        this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }*/
+      if (this.currentRow === '') {
+        this.crud.notify('请选择明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.loadingSetAllPoint = true
+      this.currentRow.point_code = this.form2.point_code
+      productOut.allSetPoint(this.currentRow).then(res => {
+        this.queryTableDdis(this.currentRow.iostorinvdtl_id)
+        this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
+        this.loadingSetAllPoint = false
+      }).catch(() => {
+        this.loadingSetAllPoint = false
+      })
+    },
+    allSetPointAllDtl() {
+    /*  if (this.form2.point_code === '') {
+        this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }*/
+      this.loadingSetAllPoint = true
+      const data = {
+        'point_code': this.form2.point_code,
+        'iostorinv_id': this.mstrow.iostorinv_id
+      }
+      productOut.allSetPoint(data).then(res => {
+        this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
+        this.loadingSetAllPoint = false
+      }).catch(() => {
+        this.loadingSetAllPoint = false
+      })
+    },
+    queryTableDtl() {
+      productOut.getOutBillDtl({ 'iostorinv_id': this.mstrow.iostorinv_id }).then(res => {
+        this.tableDtl = res
+      })
+    },
+    queryTableDdis(iostorinvdtl_id) {
+      productOut.getOutBillDis({ 'iostorinvdtl_id': iostorinvdtl_id, 'bill_status': '01' }).then(res => {
+        this.tabledis = res
+      }).catch(() => {
+        this.tabledis = []
+      })
+    },
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      const assign_qty = parseFloat(row.assign_qty)
+      const plan_qty = parseFloat(row.plan_qty)
+
+      if (column.property === 'assign_qty') {
+        if (assign_qty > plan_qty) {
+          return 'background: yellow'
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size:20px;
+  color:#303133;
+}
+
+.crud-opts2 .role-span {
+  padding: 10px 0px 10px 0px;
+}
+.crud-opts2 .crud-opts-form {
+  padding: 10px 0px 0px 20px;
+}
+
+.input-with-select  {
+  background-color: #fff;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/StructIvt.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/StructIvt.vue
new file mode 100644
index 00000000..1d85fe3a
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/StructIvt.vue
@@ -0,0 +1,279 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    fullscreen
+    @close="close"
+    @open="open"
+  >
+    <span slot="title" class="dialog-footer">
+      <div class="crud-opts2">
+        <span class="el-dialog__title2">出库手工分配</span>
+        <span class="crud-opts-right2">
+          <!--左侧插槽-->
+          <slot name="left" />
+          <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
+          <el-button slot="left" type="primary" @click="submit">保存</el-button>
+        </span>
+      </div>
+    </span>
+    <div class="crud-opts2">
+      <span class="role-span" style="width: 100px">可分配库存</span>
+      <div class="crud-opts-form">
+        <el-form ref="form2" :inline="true" :model="queryrow" size="mini">
+          <el-form-item label="待分配" prop="unassign_qty">
+            <el-input-number
+              v-model="queryrow.unassign_qty"
+              :controls="false"
+              :precision="3"
+              :min="0"
+              disabled
+            />
+          </el-form-item>
+          <el-form-item label="已分配" prop="assign_qty">
+            <el-input-number
+              v-model="queryrow.assign_qty"
+              :controls="false"
+              :precision="3"
+              :min="0"
+              disabled
+            />
+          </el-form-item>
+          <el-form-item label="库区" prop="sect_id">
+            <el-cascader
+              placeholder="请选择"
+              :options="sects"
+              :props="{ checkStrictly: true }"
+              clearable
+              @change="sectQueryChange"
+            />
+          </el-form-item>
+          <el-form-item label="关键字" prop="remark">
+            <el-input
+              v-model="queryrow.remark"
+              clearable
+              style="width: 220px"
+              size="mini"
+              placeholder="货位编码"
+              prefix-icon="el-icon-search"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item label="sap批次" prop="remark">
+            <el-input
+              v-model="queryrow.sap_pcsn"
+              clearable
+              style="width: 220px"
+              size="mini"
+              placeholder="sap批次"
+              prefix-icon="el-icon-search"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-form-item label="子卷号" prop="remark">
+            <el-input
+              v-model="queryrow.pcsn"
+              clearable
+              style="width: 220px"
+              size="mini"
+              placeholder="子卷号"
+              prefix-icon="el-icon-search"
+              class="filter-item"
+            />
+          </el-form-item>
+          <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">搜索</el-button>
+        </el-form>
+      </div>
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="tableDtl"
+      style="width: 100%;"
+      max-height="500"
+      border
+      :highlight-current-row="true"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column show-overflow-tooltip prop="sect_name" label="库区" align="center" />
+      <el-table-column show-overflow-tooltip prop="struct_code" label="仓位" align="center" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="箱号" align="center" width="250px" />
+      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+      <el-table-column show-overflow-tooltip sortable prop="pcsn" label="子卷批次号" align="center" width="150px" />
+      <el-table-column show-overflow-tooltip sortable prop="sap_pcsn" label="sap批次" align="center" width="140px" />
+      <el-table-column show-overflow-tooltip prop="canuse_qty" label="可出重量" :formatter="crud.formatNum3" align="center" />
+<!--      <el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" width="160" align="center">-->
+<!--        <template scope="scope">-->
+<!--          <el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :max="100000000" />-->
+<!--          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />-->
+      <el-table-column align="center" label="操作" width="160" fixed="right">
+        <template scope="scope">
+          <el-button v-show="!scope.row.edit" type="primary" class="filter-item" size="mini" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+          <el-button v-show="scope.row.edit" type="success" class="filter-item" size="mini" icon="el-icon-check" @click="handleEdit(scope.$index, scope.row)">完成</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header } from '@crud/crud'
+// import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
+import productOut from '@/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout'
+// import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
+
+export default {
+  name: 'StructIvt',
+  components: { },
+  mixins: [header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    rowmst: {
+      type: Object
+    },
+    openArray: {
+      type: Array,
+      default: () => { return [] }
+    },
+    storId: {
+      type: String,
+      default: null
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      dialogVisible2: false,
+      goal_unassign_qty: 0,
+      queryrow: {},
+      sects: [],
+      tableDtl: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openArray: {
+      handler(newValue, oldValue) {
+        this.tableDtl = newValue
+      }
+    },
+    rowmst: {
+      handler(newValue, oldValue) {
+        this.queryrow = newValue
+        this.goal_unassign_qty = JSON.parse(JSON.stringify(this.queryrow.unassign_qty))
+      }
+    }
+  },
+  methods: {
+    open() {
+    /*  crudUserStor.getSect({ 'stor_id': this.storId }).then(res => {
+        this.sects = res.content
+      })*/
+      this.query.source_bill_code = this.queryrow.source_bill_code
+      this.query.material_id = this.queryrow.material_id
+    },
+    queryStruct() {
+      this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) + parseFloat(this.queryrow.assign_qty)
+      this.queryrow.assign_qty = 0
+  /*    productOut.getStructIvt(this.queryrow).then(res => {
+        this.tableDtl = res
+      })*/
+    },
+    sectQueryChange(val) {
+      if (val.length === 1) {
+        this.queryrow.stor_id = val[0]
+        this.queryrow.sect_id = ''
+      }
+      if (val.length === 0) {
+        this.queryrow.sect_id = ''
+        this.queryrow.stor_id = ''
+      }
+      if (val.length === 2) {
+        this.queryrow.stor_id = val[0]
+        this.queryrow.sect_id = val[1]
+      }
+    },
+    handleEdit(index, row) {
+      // 判断是否可以关闭编辑状态
+      if (row.edit === undefined) {
+        this.$set(row, 'edit', false)
+      }
+      row.edit = !row.edit
+      if (row.edit) {
+        this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) - parseFloat(row.canuse_qty)
+        this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) + parseFloat(row.canuse_qty)
+      } else {
+        this.queryrow.assign_qty = parseFloat(this.queryrow.assign_qty) - parseFloat(row.canuse_qty)
+        // 如果待分配重量等于0则 明细重量 - 已分配重量
+        if (parseInt(this.queryrow.unassign_qty) === 0) {
+          this.queryrow.unassign_qty = parseFloat(this.goal_unassign_qty) - parseFloat(this.queryrow.assign_qty)
+        } else {
+          this.queryrow.unassign_qty = parseFloat(this.queryrow.unassign_qty) + parseFloat(row.canuse_qty)
+        }
+        if (this.queryrow.unassign_qty > this.goal_unassign_qty) {
+          this.queryrow.unassign_qty = JSON.parse(JSON.stringify(this.goal_unassign_qty))
+        }
+        // 如果已分配汇总量 > 明细重量 则待分配重量为0
+        if (this.queryrow.assign_qty > this.goal_unassign_qty) {
+          this.queryrow.unassign_qty = parseFloat('0')
+        }
+      }
+      this.tableDtl.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+      this.$emit('StructIvtClosed')
+    },
+    submit() {
+      if (parseFloat(this.queryrow.assign_qty) === 0) {
+        this.crud.notify('请分配后再提交', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      if (parseFloat(this.queryrow.unassign_qty) === 0) {
+        const rows = []
+        this.tableDtl.forEach((item) => {
+          if (item.edit) {
+            rows.push(item)
+          }
+        })
+        productOut.manualDiv({ 'row': this.queryrow, 'rows': rows }).then(res => {
+          this.$emit('update:dialogShow', false)
+          this.$emit('StructIvtClosed')
+        })
+      } else {
+        this.$confirm('未分配重量不为0,是否继续提交？')
+          .then(_ => {
+            const rows = []
+            this.tableDtl.forEach((item) => {
+              if (item.edit) {
+                rows.push(item)
+              }
+            })
+            productOut.manualDiv({ 'row': this.queryrow, 'rows': rows }).then(res => {
+              this.$emit('update:dialogShow', false)
+              this.$emit('StructIvtClosed')
+            })
+          })
+          .catch(_ => {
+
+          })
+      }
+    }
+  }
+}
+</script>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/ViewDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/ViewDialog.vue
new file mode 100644
index 00000000..22e697da
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/ViewDialog.vue
@@ -0,0 +1,282 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    append-to-body
+    title="出库单详情"
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    fullscreen
+    @close="close"
+    @open="open"
+  >
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
+      <el-form-item label="单据号" prop="bill_code">
+        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
+        <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="生产车间">
+        <el-select
+          v-model="form.product_code"
+          clearable
+          size="mini"
+          placeholder="全部"
+          :disabled="true"
+          class="filter-item"
+          @change="crud.toQuery"
+        >
+          <el-option
+            v-for="item in dict.product_area"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="业务类型" prop="bill_type">
+        <el-select
+          v-model="form.bill_type"
+          clearable
+          filterable
+          size="mini"
+          placeholder="业务类型"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in dict.bill_type"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="bill_status">
+        <el-select
+          v-model="form.bill_status"
+          clearable
+          style="width: 210px"
+          placeholder="单据状态"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in dict.io_bill_status"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="明细数" prop="detail_count">
+        <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
+        <el-input v-model="form.detail_count" size="mini" disabled style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="总重量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
+        <el-input-number
+          v-model="form.total_qty"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="业务日期" prop="biz_date">
+        <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="true" />
+      </el-form-item>
+    </el-form>
+    <div class="crud-opts2">
+      <span class="role-span2">出库明细</span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :data="tableDtl"
+        style="width: 100%;"
+        max-height="300"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="handleDtlCurrentChange"
+      >
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
+        <el-table-column min-width="140" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column prop="pcsn" label="订单号" width="150px" align="center" show-overflow-tooltip />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column prop="assign_qty" :formatter="crud.formatNum3" label="已分配重量" align="center" width="100px" />
+        <el-table-column prop="unassign_qty" :formatter="crud.formatNum3" label="未分配重量" align="center" width="100px" />
+        <el-table-column prop="qty_unit_name" label="单位" align="center" />
+        <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
+      </el-table>
+    </el-card>
+    <div class="crud-opts2">
+      <span class="role-span">作业明细</span>
+    </div>
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table2"
+        :data="tabledis"
+        style="width: 100%;"
+        max-height="300"
+        size="mini"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="handleDisCurrentChange"
+      >
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
+        <el-table-column prop="pcsn" label="订单号" align="center" show-overflow-tooltip />
+        <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
+        <el-table-column prop="struct_code" label="仓位" align="center" show-overflow-tooltip />
+        <el-table-column prop="region_code" label="区域" align="center" show-overflow-tooltip />
+        <el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
+      </el-table>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+
+import { crud } from '@crud/crud'
+import productOut from '@/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout'
+import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+
+export default {
+  name: 'ViewDialog',
+  components: { },
+  mixins: [crud()],
+  dicts: ['io_bill_status', 'work_status', 'task_status', 'SCH_TASK_TYPE_DTL', 'bill_type', 'product_area'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    rowmst: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      tableDtl: [],
+      tabledis: [],
+      storlist: [],
+      currentdtl: null,
+      currentDis: {},
+      form: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    rowmst: {
+      handler(newValue) {
+        this.form = newValue
+      }
+    }
+  },
+  created() {
+    crudProductIn.queryStor().then(res => {
+      this.storlist = res
+    })
+  },
+  methods: {
+    open() {
+      this.queryTableDtl()
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+      this.currentDis = {}
+      this.currentdtl = null
+      this.tableDtl = []
+      this.tabledis = []
+      this.$emit('AddChanged')
+    },
+    bill_statusFormat(row) {
+      return this.dict.label.io_bill_status[row.bill_status]
+    },
+    taskdtl_typeFormat(row) {
+      return this.dict.label.SCH_TASK_TYPE_DTL[row.taskdtl_type]
+    },
+    task_statusFormat(row) {
+      return this.dict.label.task_status[row.task_status]
+    },
+    work_statusFormat(row) {
+      return this.dict.label.work_status[row.work_status]
+    },
+    handleDtlCurrentChange(current) {
+      if (current !== null) {
+        this.tabledis = []
+        this.currentdtl = current
+        this.queryTableDdis()
+      } else {
+        this.tabledis = []
+        this.currentdtl = {}
+      }
+    },
+    invtypeFormat(row, column) {
+      for (const item of this.billtypelist) {
+        if (item.code === row.source_bill_type) {
+          return item.name
+        }
+      }
+    },
+    handleDisCurrentChange(current) {
+      this.currentDis = current
+    },
+    queryTableDtl() {
+      productOut.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+        this.tableDtl = res
+      })
+    },
+    queryTableDdis() {
+      if (this.currentdtl !== null) {
+        productOut.getOutBillDis({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
+          this.tabledis = res
+        }).catch(() => {
+          this.tabledis = []
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size:20px;
+  color:#303133;
+}
+
+.crud-opts2 .role-span2 {
+  padding: 0px 0px 20px 0px;
+}
+.crud-opts2 {
+  padding: 10px 0px 0px 50px;
+}
+
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/index.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/index.vue
new file mode 100644
index 00000000..aba284f1
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/index.vue
@@ -0,0 +1,325 @@
+<!--suppress ALL -->
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="模糊查询">
+            <el-input
+              v-model="query.bill_code"
+              size="mini"
+              clearable
+              placeholder="单据号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="生产车间">
+            <el-select
+              v-model="query.product_code"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              clearable
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.IO_BILL_STATUS"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="业务类型">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="业务类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_OUT_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="dis_flag"
+          @click="divOpen"
+        >
+          分配
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          :loading="loadingConfirm"
+          type="warning"
+          :disabled="confirm_flag"
+          icon="el-icon-check"
+          size="mini"
+          @click="confirm"
+        >
+          强制确认
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        style="width: 100%;"
+        :highlight-current-row="true"
+        @selection-change="crud.selectionChangeHandler"
+        @current-change="handleCurrentChange"
+        @select="handleSelectionChange"
+        @select-all="onSelectAll"
+      >
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :disabled-edit="canUd(scope.row)"
+              :disabled-dle="canUd(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column :selectable="checkboxT" type="selection" width="55" />
+        <el-table-column show-overflow-tooltip prop="bill_code" width="130" label="单据号">
+          <template slot-scope="scope">
+            <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column show-overflow-tooltip :formatter="stateFormat" width="80" prop="bill_status" label="单据状态" />
+        <el-table-column show-overflow-tooltip prop="product_code" label="生产车间" width="80" />
+        <el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" />
+        <el-table-column show-overflow-tooltip width="100" prop="biz_date" label="业务日期" />
+        <el-table-column show-overflow-tooltip label="明细数" align="center" prop="detail_count" width="60" />
+        <el-table-column show-overflow-tooltip label="总重量" align="center" prop="total_qty" width="100" />
+        <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
+        <el-table-column show-overflow-tooltip label="制单人" align="center" prop="create_name" />
+        <el-table-column show-overflow-tooltip label="制单时间" align="center" prop="create_time" width="140" />
+        <el-table-column show-overflow-tooltip label="修改人" align="center" prop="create_name" />
+        <el-table-column show-overflow-tooltip label="修改时间" align="center" prop="update_time" width="140" />
+        <el-table-column show-overflow-tooltip label="分配人" align="center" prop="dis_name" />
+        <el-table-column show-overflow-tooltip label="分配时间" align="center" prop="dis_time" width="140" />
+        <el-table-column show-overflow-tooltip label="确认人" align="center" prop="confirm_name" />
+        <el-table-column show-overflow-tooltip label="确认时间" align="center" prop="confirm_time" width="140" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <AddDialog @AddChanged="querytable" />
+    <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
+    <DivDialog :dialog-show.sync="divShow" :open-array="openParam" :stor-id="storId" :rowmst="mstrow" @DivChanged="querytable" />
+  </div>
+</template>
+
+<script>
+import productOut from '@/views/wms/storage_manage/product/productOut/productout'
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import AddDialog from '@/views/wms/storage_manage/rawproduct/rawProductOut/AddDialog'
+import DivDialog from '@/views/wms/storage_manage/rawproduct/rawProductOut/DivDialog'
+import ViewDialog from '@//views/wms/storage_manage/rawproduct/rawProductOut/ViewDialog'
+import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
+
+export default {
+  name: 'ProductOut',
+  components: { ViewDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, DivDialog },
+  cruds() {
+    return CRUD({ title: '用户', idField: 'iostorinv_id', url: 'api/productOut', crudMethod: { ...productOut },
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      }})
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['IO_BILL_STATUS', 'ST_INV_OUT_TYPE', 'product_area'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {
+        add: ['admin', 'checkoutbill:add'],
+        edit: ['admin', 'checkoutbill:edit'],
+        del: ['admin', 'checkoutbill:del']
+      },
+      openMoneyDialog: false,
+      loadingConfirm: false,
+      divShow: false,
+      taskShow: false,
+      dis_flag: true,
+      work_flag: true,
+      confirm_flag: true,
+      openParam: [],
+      openParamMoney: null,
+      mstrow: {},
+      viewShow: false,
+      currentRow: null,
+      checkrows: [],
+      billtypelist: [],
+      storlist: [],
+      storId: null
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudProductIn.queryStor().then(res => {
+      this.storlist = res
+    })
+  },
+  methods: {
+    canUd(row) {
+      return row.bill_status !== '10'
+    },
+    toView(index, row) {
+      this.mstrow = row
+      this.viewShow = true
+    },
+    [CRUD.HOOK.beforeRefresh]() {
+      this.handleCurrentChange(null)
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+        this.buttonChange(row)
+      } else if (val.length === 1) {
+        this.buttonChange(row)
+      } else {
+        this.handleCurrentChange(null)
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+      this.handleCurrentChange(null)
+    },
+    buttonChange(current) {
+      if (current !== null) {
+        this.currentRow = current
+        if (current.bill_status === '10' || current.bill_status === '20' || current.bill_status === '30') {
+          this.dis_flag = false
+        } else {
+          this.dis_flag = true
+        }
+        if (current.bill_status === '30') {
+          this.confirm_flag = false
+        } else {
+          this.confirm_flag = true
+        }
+      }
+    },
+    stateFormat(row, column) {
+      return this.dict.label.IO_BILL_STATUS[row.bill_status]
+    },
+    bill_typeFormat(row) {
+      return this.dict.label.ST_INV_OUT_TYPE[row.bill_type]
+    },
+    handleCurrentChange(current) {
+      if (current === null) {
+        this.dis_flag = true
+        this.confirm_flag = true
+        this.work_flag = true
+        this.currentRow = {}
+      }
+    },
+    checkboxT(row) {
+      return row.bill_status !== '99'
+    },
+    divOpen() {
+      productOut.getOutBillDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+        this.openParam = res
+        this.storId = this.currentRow.product_code
+        this.divShow = true
+        this.mstrow = this.currentRow
+      })
+    },
+    confirm() {
+      this.loadingConfirm = true
+      productOut.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+        this.querytable()
+        this.crud.notify('出库成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.loadingConfirm = false
+      }).catch(() => {
+        this.loadingConfirm = false
+      })
+    },
+    querytable() {
+      this.onSelectAll()
+      this.crud.toQuery()
+      this.handleCurrentChange(null)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout.js b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout.js
new file mode 100644
index 00000000..8d4c1e1c
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout.js
@@ -0,0 +1,228 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/productOut',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/productOut/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/productOut',
+    method: 'put',
+    data
+  })
+}
+
+export function getOutBillDtl(data) {
+  return request({
+    url: '/api/productOut/getOutBillDtl',
+    method: 'post',
+    data
+  })
+}
+export function getOutBillDis(data) {
+  return request({
+    url: '/api/productOut/getOutBillDis',
+    method: 'post',
+    data
+  })
+}
+export function getOutBillDisDtl(params) {
+  return request({
+    url: '/api/productOut/getOutBillDisDtl',
+    method: 'get',
+    params
+  })
+}
+export function getOutBillTask(params) {
+  return request({
+    url: '/api/productOut/getOutBillTask',
+    method: 'get',
+    params
+  })
+}
+export function getInvTypes() {
+  return request({
+    url: '/api/productOut/getInvTypes',
+    method: 'get'
+  })
+}
+export function insertDtl(data) {
+  return request({
+    url: '/api/productOut/insertDtl',
+    method: 'post',
+    data
+  })
+}
+export function allDiv(data) {
+  return request({
+    url: '/api/productOut/allDiv',
+    method: 'post',
+    data
+  })
+}
+export function allDivOne(data) {
+  return request({
+    url: '/api/productOut/allDivOne',
+    method: 'post',
+    data
+  })
+}
+export function allCancel(data) {
+  return request({
+    url: '/api/productOut/allCancel',
+    method: 'post',
+    data
+  })
+}
+export function oneCancel(data) {
+  return request({
+    url: '/api/productOut/oneCancel',
+    method: 'post',
+    data
+  })
+}
+export function setPoint(data) {
+  return request({
+    url: '/api/productOut/setPoint',
+    method: 'post',
+    data
+  })
+}
+export function oneSetPoint(data) {
+  return request({
+    url: '/api/productOut/oneSetPoint',
+    method: 'post',
+    data
+  })
+}
+export function getStructIvt(params) {
+  return request({
+    url: '/api/productOut/getStructIvt',
+    method: 'get',
+    params
+  })
+}
+export function manualDiv(data) {
+  return request({
+    url: '/api/productOut/manualDiv',
+    method: 'post',
+    data
+  })
+}
+export function confirm(data) {
+  return request({
+    url: '/api/productOut/confirm',
+    method: 'post',
+    data
+  })
+}
+export function issueTask(data) {
+  return request({
+    url: '/api/productOut/issueTask',
+    method: 'post',
+    data
+  })
+}
+export function finishTask(data) {
+  return request({
+    url: '/api/productOut/finishTask',
+    method: 'post',
+    data
+  })
+}
+export function cancleTaskfinish(data) {
+  return request({
+    url: '/api/productOut/cancleTaskfinish',
+    method: 'post',
+    data
+  })
+}
+export function paramByCodeType(data) {
+  return request({
+    url: '/api/productOut/paramByCodeType',
+    method: 'post',
+    data
+  })
+}
+export function schAreaType(data) {
+  return request({
+    url: '/api/productOut/schAreaType',
+    method: 'post',
+    data
+  })
+}
+export function backConfirm(data) {
+  return request({
+    url: '/api/productOut/backConfirm',
+    method: 'post',
+    data
+  })
+}
+export function getType() {
+  return request({
+    url: '/api/productOut/getType',
+    method: 'get'
+  })
+}
+export function moneySubmit(data) {
+  return request({
+    url: '/api/productOut/moneySubmit',
+    method: 'post',
+    data
+  })
+}
+export function getDisNum(data) {
+  return request({
+    url: '/api/productOut/getDisNum',
+    method: 'post',
+    data
+  })
+}
+export function queryBox(data) {
+  return request({
+    url: '/api/productOut/queryBox',
+    method: 'post',
+    data
+  })
+}
+export function getOutBillTask2(data) {
+  return request({
+    url: '/api/productOut/getOutBillTask2',
+    method: 'post',
+    data
+  })
+}
+export function cancelTask(data) {
+  return request({
+    url: '/api/productOut/cancelTask',
+    method: 'post',
+    data
+  })
+}
+export function allSetPoint(data) {
+  return request({
+    url: '/api/productOut/allSetPoint',
+    method: 'post',
+    data
+  })
+}
+export function oneSetPoint2(data) {
+  return request({
+    url: '/api/productOut/oneSetPoint2',
+    method: 'post',
+    data
+  })
+}
+export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2 }
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/AddDialog.vue
new file mode 100644
index 00000000..4e684fa5
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/AddDialog.vue
@@ -0,0 +1,294 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    title="盘点单新增"
+    append-to-body
+    fullscreen
+    :before-close="crud.cancelCU"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+    @open="open"
+    @close="close"
+  >
+    <el-row v-show="crud.status.cu > 0" :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
+      <el-input v-show="false" v-model="form.stor_code" placeholder="仓库编码" />
+      <el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称" />
+      <el-form-item label="单据号" prop="bill_code">
+        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
+        <el-input v-model.trim="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="仓库" prop="stor_id">
+        <label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
+        <el-select
+          v-model="form.stor_id"
+          clearable
+          placeholder="仓库"
+          class="filter-item"
+          style="width: 210px"
+          :disabled="crud.status.view > 0"
+          @change="storChange"
+        >
+          <el-option
+            v-for="item in storlist"
+            :key="item.stor_id"
+            :label="item.stor_name"
+            :value="item.stor_id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="业务类型" prop="check_type">
+        <el-select
+          v-model="form.check_type"
+          clearable
+          placeholder="业务类型"
+          style="width: 210px"
+          class="filter-item"
+          :disabled="crud.status.view > 0"
+        >
+          <el-option
+            v-for="item in dict.ST_INV_TYPE_CK"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select
+          v-model="form.status"
+          placeholder="单据状态"
+          class="filter-item"
+          :disabled="true"
+        >
+          <el-option
+            v-for="item in dict.check_bill_status"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="明细数" prop="dtl_num">
+        <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
+        <el-input v-model.trim="form.dtl_num" size="mini" disabled style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <el-input v-model.trim="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+      </el-form-item>
+    </el-form>
+    <div class="crud-opts2">
+      <span class="role-span">盘点明细</span>
+      <span v-if="crud.status.cu > 0" class="crud-opts-right2">
+
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="queryDtl()"
+        >
+          添加盘点物料
+        </el-button>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="form.tableData"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="status" label="状态" align="center" :formatter="bill_statusFormat" />
+      <el-table-column prop="sect_name" label="盘点库区" align="center" />
+      <el-table-column prop="struct_name" label="盘点货位" align="center" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
+      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="120" align="center" />
+      <el-table-column prop="material_name" label="物料名称" align="center" min-width="120" show-overflow-tooltip />
+      <el-table-column prop="base_qty" label="桶数" align="center" :formatter="crud.formatNum0" />
+      <el-table-column prop="fac_qty" label="盘点桶数" align="center" :formatter="crud.formatNum0" />
+      <el-table-column prop="qty_unit_name" label="计量单位" align="center" />
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
+        <template scope="scope">
+          <el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
+        </template>
+      </el-table-column>
+    </el-table>
+    <AddDtl :dialog-show.sync="dtlShow" @tableChanged="tableChanged" />
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { crud, form } from '@crud/crud'
+import AddDtl from '@/views/wms/storage_manage/rawproduct/rawproductCheck/AddDtl'
+import check from '@/views/wms/storage_manage/rawproduct/rawproductCheck/check'
+import crudStorattr from '@/api/wms/basedata/st/storattr'
+
+const defaultForm = {
+  check_code: '',
+  stor_id: '',
+  stor_code: '',
+  stor_name: '',
+  status: '10',
+  dtl_num: '0',
+  check_type: '',
+  remark: '',
+  create_mode: '',
+  tableData: []
+}
+export default {
+  name: 'AddDialog',
+  components: { AddDtl },
+  mixins: [crud(), form(defaultForm)],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'check_dtl_status'],
+  data() {
+    return {
+      dialogVisible: false,
+      dtlShow: false,
+      flagnow: false,
+      nowrow: {},
+      nowindex: '',
+      storlist: [],
+      rules: {
+        stor_id: [
+          { required: true, message: '仓库不能为空', trigger: 'blur' }
+        ],
+        check_type: [
+          { required: true, message: '业务类型不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      // 查询原材料库的仓库
+      crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
+        this.storlist = res.content
+      })
+    },
+    close() {
+      this.$emit('AddChanged')
+    },
+    [CRUD.HOOK.afterToEdit]() {
+      check.getOutBillDtl({ 'check_id': this.form.check_id }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          row.edit = true
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    [CRUD.HOOK.afterToView]() {
+      check.getOutBillDtl({ 'check_id': this.form.check_id }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          row.edit = true
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    bill_statusFormat(row) {
+      return this.dict.label.check_dtl_status[row.status]
+    },
+    storChange(row) {
+      this.storlist.forEach((item) => {
+        if (item.stor_id === row) {
+          this.form.stor_code = item.stor_code
+          this.form.stor_name = item.stor_name
+        }
+      })
+    },
+    async queryDtl() {
+      if (this.form.check_type === '') {
+        this.crud.notify('请选择盘点单类型！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.dtlShow = true
+    },
+    tableChanged(rows) {
+      const tablemap = new Map()
+      rows.forEach((item) => {
+        if (this.form.tableData.length !== 0) {
+          this.flagnow = false
+          for (let i = 0; i < this.form.tableData.length; i++) {
+            if ((this.form.tableData[i].struct_code === item.struct_code) && (this.form.tableData[i].material_code === item.material_code)) {
+              this.flagnow = true
+            }
+          }
+          if (!this.flagnow) {
+            item.edit = false
+            item.status = '01'
+            tablemap.set(item.struct_code + '间隔' + item.material_code, item)
+          }
+        } else {
+          item.edit = false
+          item.status = '01'
+          tablemap.set(item.struct_code + '间隔' + item.material_code, item)
+        }
+      })
+      for (const value of tablemap.values()) {
+        this.form.tableData.push(value)
+      }
+      this.form.dtl_num = this.form.tableData.length
+    },
+    deleteRow(index, rows) {
+      rows.splice(index, 1)
+      this.nowindex = ''
+      this.nowrow = {}
+      this.form.dtl_num = this.form.tableData.length
+    },
+    [CRUD.HOOK.beforeSubmit]() {
+      if (this.form.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+  padding: 4px 4px;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/AddDtl.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/AddDtl.vue
new file mode 100644
index 00000000..0d1ba2e9
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/AddDtl.vue
@@ -0,0 +1,173 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    title="盘点库存选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="false"
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-row>
+      <el-col :span="6">
+        <!-- 搜索 -->
+        <el-cascader
+          placeholder="库区"
+          :options="sects"
+          :props="{ checkStrictly: true }"
+          clearable
+          @change="sectQueryChange"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.struct_code"
+          clearable
+          size="mini"
+          placeholder="货位号模糊查询"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.remark"
+          clearable
+          size="mini"
+          placeholder="物料"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-col>
+
+      <el-col :span="6">
+        <rrOperation />
+      </el-col>
+    </el-row>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column show-overflow-tooltip prop="sect_name" label="库区" width="110px" />
+      <el-table-column show-overflow-tooltip prop="struct_code" label="货位" width="110px" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
+      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="150px" />
+      <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" width="110px" />
+      <el-table-column show-overflow-tooltip prop="base_qty" label="桶数" :formatter="crud.formatNum0" />
+      <el-table-column show-overflow-tooltip prop="qty_unit_name" label="计量单位" />
+      <el-table-column show-overflow-tooltip prop="storage_qty" :formatter="crud.formatNum3" label="重量" width="110px" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
+      <el-button slot="left" type="primary" @click="submit">保存</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import crudSectattr from '@/api/wms/basedata/st/sectattr'
+
+export default {
+  name: 'AddDtl',
+  components: { rrOperation, pagination },
+  cruds() {
+    return CRUD({ title: '用户', idField: 'stockrecord_id', url: 'api/check/getStructIvt',
+      query: {
+        struct_code: '',
+        remark: '',
+        sect_id: '',
+        stor_id: ''
+      },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      }})
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      opendtlParam: '',
+      sects: [],
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      crudSectattr.getSect({ is_materialstore: '1' }).then(res => {
+        this.sects = res.content
+      })
+      this.crud.toQuery()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    sectQueryChange(val) {
+      if (val.length === 1) {
+        this.crud.query.stor_id = val[0]
+        this.crud.query.sect_id = ''
+      }
+      if (val.length === 0) {
+        this.crud.query.sect_id = ''
+        this.crud.query.stor_id = ''
+      }
+      if (val.length === 2) {
+        this.crud.query.stor_id = val[0]
+        this.crud.query.sect_id = val[1]
+      }
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选载具物料')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+    }
+  }
+}
+</script>
+
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/CheckDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/CheckDialog.vue
new file mode 100644
index 00000000..78297a6c
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/CheckDialog.vue
@@ -0,0 +1,407 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    title="盘点单盘点"
+    append-to-body
+    fullscreen
+    :visible.sync="dialogVisible"
+    @open="open"
+    @close="close"
+  >
+    <el-card class="box-card" shadow="never">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
+        <el-input v-show="false" v-model="form.stor_code" placeholder="仓库编码" />
+        <el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称" />
+        <el-form-item label="单据号" prop="check_code">
+          <el-input v-model.trim="form.check_code" placeholder="单据号" clearable disabled />
+        </el-form-item>
+        <el-form-item label="业务类型" prop="check_type">
+          <el-select
+            v-model="form.check_type"
+            placeholder="业务类型"
+            :disabled="true"
+            class="filter-item"
+          >
+            <el-option
+              v-for="item in dict.ST_INV_TYPE_CK"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="仓库" prop="stor_id">
+          <el-select
+            v-model="form.stor_id"
+            placeholder="仓库"
+            class="filter-item"
+            :disabled="true"
+          >
+            <el-option
+              v-for="item in storlist"
+              :key="item.stor_id"
+              :label="item.stor_name"
+              :value="item.stor_id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="单据状态" prop="status">
+          <el-select
+            v-model="form.status"
+            placeholder="单据状态"
+            class="filter-item"
+            :disabled="true"
+          >
+            <el-option
+              v-for="item in dict.check_bill_status"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="明细数" prop="dtl_num">
+          <el-input v-model.trim="form.dtl_num" style="width: 200px" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model.trim="form.remark" :disabled="true" style="width: 480px;" clearable :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" maxlength="100" show-word-limit />
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <div class="crud-opts2">
+      <span class="role-span">盘点明细</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="add_flag"
+          @click="addrow"
+        >
+          新增一行
+        </el-button>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="tableData"
+      style="width: 100%;"
+      max-height="300"
+      border
+      :highlight-current-row="true"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @current-change="handleCurrentChange"
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="sect_name" label="盘点库区" align="center" />
+      <el-table-column prop="struct_name" label="盘点货位" align="center" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
+      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
+        <template scope="scope">
+          <el-input v-show="isShow(scope.$index, scope.row,1)" v-model="scope.row.material_code" disabled class="input-with-select">
+            <el-button slot="append" icon="el-icon-search" @click="queryMater(scope.$index, scope.row)" />
+          </el-input>
+          <span v-show="isShow(scope.$index, scope.row,3)">{{ scope.row.material_code }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="material_name" label="物料名称" align="center" />
+      <el-table-column prop="base_qty" label="桶数" :formatter="crud.formatNum0" align="center" />
+      <el-table-column show-overflow-tooltip prop="fac_qty" label="盘点桶数" width="160" align="center">
+        <template scope="scope">
+          <el-input-number v-show="isShow(scope.$index, scope.row,2)" v-model="scope.row.fac_qty" :precision="0" :min="0" />
+          <span v-show="isShow(scope.$index, scope.row,4)">{{ scope.row.fac_qty }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qty_unit_name" label="计量单位" align="center" />
+      <el-table-column prop="check_result" label="是否异常" align="center" :formatter="check_resultFormat" />
+      <el-table-column prop="status" label="状态" align="center" :formatter="bill_statusFormat" />
+      <el-table-column align="center" label="操作" width="160" fixed="right">
+        <template scope="scope">
+          <el-button :disabled="isCanDel(scope.$index, scope.row,1)" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, tableData)" />
+          <el-button v-show="!scope.row.edit" :disabled="isCanDel(scope.$index, scope.row,2)" type="primary" class="filter-item" size="mini" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+          <el-button v-show="scope.row.edit" :disabled="isCanDel(scope.$index, scope.row,2)" type="success" class="filter-item" size="mini" icon="el-icon-check" @click="handleEdit(scope.$index, scope.row)">完成</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="saveCheck">保存</el-button>
+      <el-button type="primary" @click="submitCheck">确认</el-button>
+    </span>
+    <MaterDialog :dialog-show.sync="materShow" @tableChanged2="tableChanged2" />
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { crud } from '@crud/crud'
+import check from '@/views/wms/storage_manage/rawproduct/rawproductCheck/check'
+import crudStorattr from '@/api/wms/basedata/st/storattr'
+import MaterDialog from '@/views/wms/pub/MaterDialog'
+
+export default {
+  name: 'CheckDialog',
+  components: { MaterDialog },
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    bussConfig: {
+      type: Object
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'check_dtl_status', 'check_result'],
+  data() {
+    return {
+      dialogVisible: false,
+      materShow: false,
+      add_flag: true,
+      nowrow: null,
+      nowindex: '',
+      storlist: [],
+      form: {
+        check_id: '',
+        check_code: '',
+        stor_id: '',
+        stor_code: '',
+        stor_name: '',
+        status: '10',
+        dtl_num: '0',
+        check_type: '',
+        remark: '',
+        create_mode: ''
+      },
+      tableData: [],
+      rules: {
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      // 查询原材料库的仓库
+      crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
+        this.storlist = res.content
+      })
+      check.getOutBillDtl2({ 'check_id': this.form.check_id }).then(res => {
+        this.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.tableData.length; i++) {
+          const row = this.tableData[i]
+          row.edit = false
+          if (row.status > '04') {
+            row.edit = true
+          }
+          this.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    close() {
+      this.$emit('AddChanged')
+    },
+    handleCurrentChange(current) {
+      if (current !== null) {
+        this.nowrow = current
+        const num = parseFloat(current.base_qty)
+        if (num > 0) {
+          this.add_flag = false
+        } else {
+          this.add_flag = true
+        }
+      } else {
+        this.nowrow = null
+        this.add_flag = true
+      }
+    },
+    isCanDel(index, row, type) {
+      const num = parseFloat(row.base_qty)
+      if (type === 1) {
+        if (row.status > '04' || num > 0) {
+          return true
+        } else {
+          return false
+        }
+      } else {
+        if (row.status > '04') {
+          return true
+        } else {
+          return false
+        }
+      }
+    },
+    isShow(index, row, type) {
+      const num = parseFloat(row.base_qty)
+      if (type === 1) {
+        if (row.status > '04') {
+          return false
+        } else {
+          if (num > 0) {
+            return false
+          } else {
+            if (row.edit) {
+              return false
+            } else {
+              return true
+            }
+          }
+        }
+      } else if (type === 2) {
+        if (row.status > '04') {
+          return false
+        } else {
+          if (row.edit) {
+            return false
+          } else {
+            return true
+          }
+        }
+      } else if (type === 3) {
+        if (row.status > '04') {
+          return true
+        } else {
+          if (num > 0) {
+            return true
+          } else {
+            if (row.edit) {
+              return true
+            } else {
+              return false
+            }
+          }
+        }
+      } else if (type === 4) {
+        if (row.status > '04') {
+          return true
+        } else {
+          if (row.edit) {
+            return true
+          } else {
+            return false
+          }
+        }
+      }
+    },
+    setForm(row) {
+      this.dialogVisible = true
+      this.form = row
+    },
+    bill_statusFormat(row, column) {
+      return this.dict.label.check_dtl_status[row.status]
+    },
+    check_resultFormat(row, column) {
+      return this.dict.label.check_result[row.check_result]
+    },
+    addrow() {
+      if (this.nowrow === null) {
+        this.crud.notify('请先选中一条已存在的库存明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      this.tableData.push({ check_id: this.form.check_id, check_code: this.form.check_code, checkdtl_id: '', sect_id: this.nowrow.sect_id, sect_name: this.nowrow.sect_name, struct_id: this.nowrow.struct_id, struct_name: this.nowrow.struct_name, storagevehicle_id: this.nowrow.storagevehicle_id, storagevehicle_code: this.nowrow.storagevehicle_code, status: '01', material_id: '', material_name: '', base_qty: '0', qty_unit_id: '42', qty_unit_name: '桶', is_down: '0', fac_qty: '', check_result: '0', edit: false })
+      this.form.dtl_num = this.tableData.length
+    },
+    async queryMater(index, row) {
+      this.materShow = true
+      this.nowindex = index
+      this.nowrow = row
+    },
+    tableChanged2(row) {
+      for (let i = 0; i < this.tableData.length; i++) {
+        if ((this.tableData[i].material_id === row.material_id) && (this.tableData[i].storagevehicle_code === this.nowrow.storagevehicle_code) && (this.tableData[i].struct_id === this.nowrow.struct_id)) {
+          this.crud.notify('不允许货位、载具、物料同时相同！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+      }
+      this.nowrow.material_id = row.material_id
+      this.nowrow.material_code = row.material_code
+      this.nowrow.material_name = row.material_name
+      this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
+    },
+    handleEdit(index, row) {
+      // 判断是否可以关闭编辑状态
+      if (!row.edit) {
+        const num = parseFloat(row.base_qty)
+        const fac_qty = parseFloat(row.fac_qty)
+        if (num <= 0 && fac_qty <= 0) {
+          this.crud.notify('不允许新增明细,盘点数量为0！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!row.material_id) {
+          this.crud.notify('物料不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+      }
+      row.edit = !row.edit
+      this.tableData.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
+    },
+    deleteRow(index, rows) {
+      rows.splice(index, 1)
+      this.nowindex = ''
+      this.nowrow = null
+      this.form.detail_count = this.tableData.length
+    },
+    submitCheck() {
+      if (this.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      for (let i = 0; i < this.tableData.length; i++) {
+        if (!this.tableData[i].edit) {
+          this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
+          return false
+        }
+      }
+      check.confirm({ 'row': this.form, 'rows': this.tableData }).then(res => {
+        this.dialogVisible = false
+      })
+    },
+    saveCheck() {
+      if (this.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      for (let i = 0; i < this.tableData.length; i++) {
+        if (!this.tableData[i].edit) {
+          this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
+          return false
+        }
+      }
+      check.saveCheck({ 'row': this.form, 'rows': this.tableData }).then(res => {
+        this.dialogVisible = false
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+  padding: 4px 4px;
+}
+.input-with-select  {
+  background-color: #fff;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/ProcessDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/ProcessDialog.vue
new file mode 100644
index 00000000..b438d44d
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/ProcessDialog.vue
@@ -0,0 +1,252 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    title="盘点单异常处理"
+    append-to-body
+    fullscreen
+    :visible.sync="dialogVisible"
+    @open="open"
+    @close="close"
+  >
+    <el-card class="box-card" shadow="never">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
+        <el-input v-show="false" v-model="form.stor_code" placeholder="仓库编码" />
+        <el-input v-show="false" v-model="form.stor_name" placeholder="仓库名称" />
+        <el-form-item label="单据号" prop="check_code">
+          <el-input v-model.trim="form.check_code" placeholder="单据号" clearable disabled />
+        </el-form-item>
+        <el-form-item label="业务类型" prop="check_type">
+          <el-select
+            v-model="form.check_type"
+            placeholder="业务类型"
+            :disabled="true"
+            class="filter-item"
+          >
+            <el-option
+              v-for="item in dict.ST_INV_TYPE_CK"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="仓库" prop="stor_id">
+          <el-select
+            v-model="form.stor_id"
+            placeholder="仓库"
+            class="filter-item"
+            :disabled="true"
+          >
+            <el-option
+              v-for="item in storlist"
+              :key="item.stor_id"
+              :label="item.stor_name"
+              :value="item.stor_id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="单据状态" prop="status">
+          <el-select
+            v-model="form.status"
+            placeholder="单据状态"
+            class="filter-item"
+            :disabled="true"
+          >
+            <el-option
+              v-for="item in dict.check_bill_status"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="明细数" prop="dtl_num">
+          <el-input v-model.trim="form.dtl_num" style="width: 200px" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model.trim="form.remark" :disabled="true" style="width: 480px;" clearable :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" maxlength="100" show-word-limit />
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <div class="crud-opts2">
+      <span class="role-span">盘点单明细</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="process1_flag"
+          @click="process1"
+        >
+          重新盘点
+        </el-button>
+      </span>
+
+      <el-button
+        slot="left"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-plus"
+        size="mini"
+        :disabled="process0_flag"
+        @click="process0"
+      >
+        账务为准
+      </el-button>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="tableData"
+      style="width: 100%;"
+      max-height="300"
+      border
+      :highlight-current-row="true"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @current-change="handleCurrentChange"
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="sect_name" label="盘点库区" align="center" />
+      <el-table-column prop="struct_name" label="盘点货位" align="center" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
+      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center" />
+      <el-table-column prop="material_name" label="物料名称" align="center" />
+      <el-table-column prop="base_qty" label="桶数" align="center" />
+      <el-table-column show-overflow-tooltip prop="fac_qty" label="盘点桶数" :formatter="crud.formatNum0" width="160" align="center" />
+      <el-table-column prop="qty_unit_name" label="计量单位" align="center" />
+      <el-table-column prop="check_result" label="盘点结果" align="center" :formatter="check_resultFormat" />
+      <el-table-column prop="status" label="状态" align="center" :formatter="bill_statusFormat" />
+    </el-table>
+    <ReCheckDialog ref="child3" @ReCheckChanged="getOutBillDtl" />
+  </el-dialog>
+</template>
+
+<script>
+import { crud } from '@crud/crud'
+import check from '@/views/wms/storage_manage/rawproduct/rawproductCheck/check'
+import crudStorattr from '@/api/wms/basedata/st/storattr'
+import ReCheckDialog from '@/views/wms/storage_manage/rawproduct/rawproductCheck/ReCheckDialog'
+
+export default {
+  name: 'ProcessDialog',
+  components: { ReCheckDialog },
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    bussConfig: {
+      type: Object
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'check_dtl_status', 'check_result'],
+  data() {
+    return {
+      dialogVisible: false,
+      materShow: false,
+      process1_flag: true,
+      process0_flag: true,
+      nowrow: null,
+      nowindex: '',
+      storlist: [],
+      form: {
+        check_id: '',
+        check_code: '',
+        stor_id: '',
+        stor_code: '',
+        stor_name: '',
+        status: '10',
+        dtl_num: '0',
+        check_type: '',
+        remark: '',
+        create_mode: ''
+      },
+      tableData: [],
+      rules: {
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      // 查询原材料库的仓库
+      crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
+        this.storlist = res.content
+      })
+      this.getOutBillDtl()
+    },
+    close() {
+      this.$emit('AddChanged')
+    },
+    handleCurrentChange(current) {
+      if (current !== null) {
+        this.nowrow = current
+        if (current.status === '05' || current.status === '06') {
+          this.process0_flag = false
+          this.process1_flag = false
+        } else {
+          this.process0_flag = true
+          this.process1_flag = true
+        }
+      } else {
+        this.nowrow = null
+        this.process0_flag = true
+        this.process1_flag = true
+      }
+    },
+    setForm(row) {
+      this.dialogVisible = true
+      this.form = row
+    },
+    bill_statusFormat(row, column) {
+      return this.dict.label.check_dtl_status[row.status]
+    },
+    check_resultFormat(row, column) {
+      return this.dict.label.check_result[row.check_result]
+    },
+    process0() {
+      check.process0({ 'form': this.form, 'row': this.nowrow }).then(res => {
+        this.getOutBillDtl()
+      })
+    },
+    process1() {
+      if (this.nowrow !== null) {
+        this.$refs.child3.setReForm(this.nowrow)
+      }
+    },
+    getOutBillDtl() {
+      check.getOutBillDtl({ 'check_id': this.form.check_id }).then(res => {
+        this.tableData = res
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+  padding: 4px 4px;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/ReCheckDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/ReCheckDialog.vue
new file mode 100644
index 00000000..b307651a
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/ReCheckDialog.vue
@@ -0,0 +1,353 @@
+<!--suppress ALL -->
+<template>
+  <el-dialog
+    title="重新盘点"
+    append-to-body
+    fullscreen
+    :visible.sync="dialogVisible"
+    @open="open"
+    @close="close"
+  >
+    <el-card class="box-card" shadow="never">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
+        <el-form-item label="盘点单号" prop="check_code">
+          <el-input v-model.trim="form.check_code" placeholder="盘点单号" disabled />
+        </el-form-item>
+        <el-form-item label="盘点仓位" prop="struct_name">
+          <el-input v-model.trim="form.struct_name" placeholder="盘点仓位" disabled />
+        </el-form-item>
+        <el-form-item label="盘点载具" prop="storagevehicle_code">
+          <el-input v-model.trim="form.storagevehicle_code" placeholder="盘点单号" disabled />
+        </el-form-item>
+        <el-form-item label="明细数" prop="dtl_num">
+          <el-input v-model.trim="form.dtl_num" style="width: 200px" :disabled="true" />
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <div class="crud-opts2">
+      <span class="role-span">盘点明细</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="add_flag"
+          @click="addrow"
+        >
+          新增一行
+        </el-button>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="tableData"
+      style="width: 100%;"
+      max-height="300"
+      border
+      :highlight-current-row="true"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @current-change="handleCurrentChange"
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
+      <el-table-column show-overflow-tooltip prop="bucketunique" label="桶号" width="190" align="center">
+        <template scope="scope">
+          <el-input v-show="isCanDel(scope.$index, scope.row,'3')" v-model="scope.row.bucketunique" disabled class="input-with-select">
+            <el-button slot="append" icon="el-icon-search" @click="queryBucket(scope.$index, scope.row)" />
+          </el-input>
+          <span v-show="isCanDel(scope.$index, scope.row,'2')">{{ scope.row.bucketunique }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="material_code" label="物料编码" align="center" />
+      <el-table-column prop="material_name" label="物料名称" align="center" />
+      <el-table-column prop="quality_scode" label="品质类型" align="center" width="110px">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.quality_scode"
+            class="filter-item"
+            disabled
+          >
+            <el-option
+              v-for="item in dict.ST_QUALITY_SCODE"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+
+        </template>
+      </el-table-column>
+      <el-table-column prop="ivt_level" label="库存等级" align="center" width="100px">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.ivt_level"
+            class="filter-item"
+            disabled
+          >
+            <el-option
+              v-for="item in dict.ST_IVT_LEVEL"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column prop="is_active" label="是否可用" align="center" width="110px">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.is_active"
+            class="filter-item"
+            disabled
+          >
+            <el-option
+              v-for="item in dict.is_used"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column prop="pcsn" label="批次" align="center" />
+      <el-table-column prop="ivt_qty" label="库存重量" :formatter="crud.formatNum3" align="center" />
+      <el-table-column show-overflow-tooltip prop="ivt_qty_ck" label="盘点重量" width="160" align="center">
+        <template scope="scope">
+          <el-input-number v-show="!scope.row.edit" v-model="scope.row.ivt_qty_ck" :precision="3" :min="0" />
+          <span v-show="scope.row.edit">{{ scope.row.ivt_qty_ck }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qty_unit_name" label="计量单位" align="center" />
+      <el-table-column align="center" label="操作" width="160" fixed="right">
+        <template scope="scope">
+          <el-button :disabled="scope.row.new_edit" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, tableData)" />
+          <el-button v-show="!scope.row.edit" type="primary" class="filter-item" size="mini" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+          <el-button v-show="scope.row.edit" type="success" class="filter-item" size="mini" icon="el-icon-check" @click="handleEdit(scope.$index, scope.row)">完成</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="process1">确认</el-button>
+    </span>
+    <MaterDialog :dialog-show.sync="materShow" @tableChanged2="tableChanged2" />
+    <BucketDialog :dialog-show.sync="bucketShow" @bucketChange="tableChanged2" />
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { crud } from '@crud/crud'
+import check from '@/views/wms/storage_manage/rawproduct/rawproductCheck/check'
+// import BucketDialog from '@/views/wms/st/inStor/rawproductmoreOrless/NewBucketDialog'
+import MaterDialog from '@/views/wms/pub/MaterDialog'
+
+export default {
+  name: 'ReCheckDialog',
+  components: { MaterDialog, BucketDialog },
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    bussConfig: {
+      type: Object
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  dicts: ['check_bill_status', 'ST_INV_TYPE_CK', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_used'],
+  data() {
+    return {
+      dialogVisible: false,
+      materShow: false,
+      bucketShow: false,
+      add_flag: true,
+      nowrow: null,
+      nowindex: '',
+      form: {},
+      tableData: [],
+      rules: {
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      check.getOutBillDis({ 'storagevehicle_code': this.form.storagevehicle_code }).then(res => {
+        this.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.tableData.length; i++) {
+          const row = this.tableData[i]
+          row.new_edit = true
+          this.tableData.splice(i, 1, row)
+        }
+        this.form.dtl_num = this.tableData.length
+      })
+    },
+    close() {
+      this.$emit('ReCheckChanged')
+    },
+    handleCurrentChange(current) {
+      if (current !== null) {
+        this.nowrow = current
+        this.add_flag = false
+      } else {
+        this.nowrow = null
+        this.add_flag = true
+      }
+    },
+    setReForm(row) {
+      this.dialogVisible = true
+      this.form = row
+    },
+    addrow() {
+      if (this.nowrow === null) {
+        this.crud.notify('请先选中一条已存在的盘点明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      this.tableData.push({ bucketunique: '', storagevehicle_id: this.nowrow.storagevehicle_id, storagevehicle_type: this.nowrow.storagevehicle_type, storagevehicle_code: this.nowrow.storagevehicle_code, material_id: '', material_name: '', ivt_qty: '0', qty_unit_id: '', qty_unit_name: '', pcsn: '', quality_scode: '00', ivt_level: '01', is_active: '1', ivt_qty_ck: '0', edit: false, new_edit: false })
+      this.form.dtl_num = this.tableData.length
+    },
+    async queryMater(index, row) {
+      this.materShow = true
+      this.nowindex = index
+      this.nowrow = row
+    },
+    async queryBucket(index, row) {
+      this.bucketShow = true
+      this.nowindex = index
+      this.nowrow = row
+    },
+    tableChanged2(row) {
+      this.nowrow.material_code = row.material_code
+      this.nowrow.material_id = row.material_id
+      this.nowrow.material_name = row.material_name
+      this.nowrow.qty_unit_id = row.qty_unit_id
+      this.nowrow.qty_unit_name = row.qty_unit_name
+      this.nowrow.quality_scode = row.quality_scode
+      this.nowrow.is_active = row.is_active
+      this.nowrow.ivt_level = row.ivt_level
+      this.nowrow.pcsn = row.pcsn
+      this.nowrow.ivt_qty_ck = row.storage_qty
+      this.nowrow.bucketunique = row.bucketunique
+      this.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
+    },
+    isCanDel(index, row, type) {
+      if (type === '1') {
+        if (row.new_edit) {
+          return true
+        } else {
+          if (row.edit) {
+            return true
+          } else {
+            return false
+          }
+        }
+      } else if (type === '2') {
+        if (row.new_edit) {
+          return true
+        } else {
+          if (row.edit) {
+            return true
+          } else {
+            return false
+          }
+        }
+      } else if (type === '3') {
+        if (row.new_edit) {
+          return false
+        } else {
+          if (row.edit) {
+            return false
+          } else {
+            return true
+          }
+        }
+      }
+    },
+    handleEdit(index, row) {
+      // 判断是否可以关闭编辑状态
+      if (!row.edit) {
+        const num = parseFloat(row.ivt_qty)
+        const fac_qty = parseFloat(row.ivt_qty_ck)
+        if (num <= 0 && fac_qty <= 0) {
+          this.crud.notify('不允许新增明细,盘点数量为0！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!row.material_id) {
+          this.crud.notify('物料不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!row.pcsn) {
+          this.crud.notify('物料批次不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!row.bucketunique) {
+          this.crud.notify('桶号不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        for (let i = 0; i < this.tableData.length; i++) {
+          if ((this.tableData[i].bucketunique === row.bucketunique) && (index !== i)) {
+            this.crud.notify('不允许桶号同时相同！', CRUD.NOTIFICATION_TYPE.INFO)
+            return false
+          }
+        }
+      }
+      row.edit = !row.edit
+      this.tableData.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
+    },
+    deleteRow(index, rows) {
+      rows.splice(index, 1)
+      this.nowindex = ''
+      this.nowrow = null
+      this.form.detail_count = this.tableData.length
+    },
+    process1() {
+      if (this.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      for (let i = 0; i < this.tableData.length; i++) {
+        if (!this.tableData[i].edit) {
+          this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
+          return false
+        }
+      }
+      check.process1({ 'row': this.form, 'rows': this.tableData }).then(res => {
+        this.dialogVisible = false
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+  padding: 4px 4px;
+}
+.input-with-select  {
+  background-color: #fff;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/check.js b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/check.js
new file mode 100644
index 00000000..57ee1267
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/check.js
@@ -0,0 +1,104 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/check',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/check/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/check',
+    method: 'put',
+    data
+  })
+}
+
+export function getOutBillDtl(params) {
+  return request({
+    url: '/api/check/getOutBillDtl',
+    method: 'get',
+    params
+  })
+}
+export function getOutBillDtl2(params) {
+  return request({
+    url: '/api/check/getOutBillDtl2',
+    method: 'get',
+    params
+  })
+}
+export function getOutBillDis(params) {
+  return request({
+    url: '/api/check/getOutBillDis',
+    method: 'get',
+    params
+  })
+}
+export function getInvTypes() {
+  return request({
+    url: '/api/check/getInvTypes',
+    method: 'get'
+  })
+}
+export function insertDtl(data) {
+  return request({
+    url: '/api/check/insertDtl',
+    method: 'post',
+    data
+  })
+}
+export function getStructIvt(params) {
+  return request({
+    url: '/api/check/getStructIvt',
+    method: 'get',
+    params
+  })
+}
+
+export function confirm(data) {
+  return request({
+    url: '/api/check/confirm',
+    method: 'post',
+    data
+  })
+}
+export function handdown(data) {
+  return request({
+    url: '/api/check/handdown',
+    method: 'post',
+    data
+  })
+}
+export function saveCheck(data) {
+  return request({
+    url: '/api/check/saveCheck',
+    method: 'post',
+    data
+  })
+}
+export function process0(data) {
+  return request({
+    url: '/api/check/process0',
+    method: 'post',
+    data
+  })
+}
+export function process1(data) {
+  return request({
+    url: '/api/check/process1',
+    method: 'post',
+    data
+  })
+}
+export default { add, edit, del, getOutBillDtl, getStructIvt, getOutBillDtl2, confirm, getInvTypes, saveCheck, process0, getOutBillDis, process1 }
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/index.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/index.vue
new file mode 100644
index 00000000..c64b94fd
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductCheck/index.vue
@@ -0,0 +1,359 @@
+<!--suppress ALL -->
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="模糊查询">
+            <el-input
+              v-model="query.check_code"
+              size="mini"
+              clearable
+              placeholder="盘点单号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="生成方式">
+            <el-select
+              v-model="query.create_mode"
+              clearable
+              size="mini"
+              placeholder="生成方式"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_CREATE_MODE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.status"
+              clearable
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.check_bill_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="业务类型">
+            <el-select
+              v-model="query.check_type"
+              clearable
+              filterable
+              size="mini"
+              placeholder="业务类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_TYPE_CK"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          :disabled="check_flag"
+          icon="el-icon-position"
+          size="mini"
+          @click="checkOpen"
+        >
+          盘点
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          :disabled="confirm_flag"
+          icon="el-icon-check"
+          size="mini"
+          @click="confirm"
+        >
+          异常处理
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-check"
+          :disabled="downdtl_flag"
+          size="mini"
+          @click="downdtl"
+        >
+          导出Excel
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :max-height="590"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        :highlight-current-row="true"
+        @selection-change="crud.selectionChangeHandler"
+        @current-change="handleCurrentChange"
+        @select="handleSelectionChange"
+        @select-all="onSelectAll"
+      >
+        <el-table-column
+          v-permission="['admin','check:del','check:edit']"
+          label="操作"
+          width="160"
+          align="center"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :disabled-edit="canUd(scope.row)"
+              :disabled-dle="canUd(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column :selectable="checkboxT" type="selection" width="55" />
+        <el-table-column  prop="check_code" min-width="130" label="订单编码">
+          <template slot-scope="scope">
+            <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.check_code }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column  :formatter="stateFormat" min-width="100" prop="status" label="单据状态" />
+        <el-table-column prop="stor_name" label="仓库" min-width="100" />
+        <el-table-column  prop="check_type" :formatter="bill_typeFormat" min-width="100" label="业务类型" />
+        <el-table-column  prop="is_nok" :formatter="is_nokFormat" min-width="100" label="盘点状态" />
+        <el-table-column  :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100" />
+        <el-table-column label="明细数" align="center" prop="dtl_num" min-width="100" />
+        <el-table-column  prop="input_time" min-width="135" label="创建日期" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <AddDialog @AddChanged="querytable" />
+    <CheckDialog ref="child" @AddChanged="querytable" />
+    <ProcessDialog ref="child2" @AddChanged="querytable" />
+  </div>
+</template>
+
+<script>
+import check from '@/views/wms/storage_manage/rawproduct/rawproductCheck/check'
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import AddDialog from '@/views/wms/storage_manage/rawproduct/rawproductCheck/AddDialog'
+import CheckDialog from '@/views/wms/storage_manage/rawproduct/rawproductCheck/CheckDialog'
+import ProcessDialog from '@/views/wms/storage_manage/rawproduct/rawproductCheck/ProcessDialog'
+import crudStorattr from '@/api/wms/basedata/st/storattr'
+import { download } from '@/api/data'
+import { downloadFile } from '@/utils'
+
+export default {
+  name: 'Check',
+  components: { CheckDialog, AddDialog, crudOperation, rrOperation, udOperation, pagination, ProcessDialog },
+  cruds() {
+    return CRUD({ title: '用户',
+      props: {
+        // 每页数据条数
+        size: 20
+      },
+      idField: 'check_id', url: 'api/check', crudMethod: { ...check },
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      }})
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['check_bill_status', 'ST_CREATE_MODE', 'ST_INV_TYPE_CK'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {
+        add: ['admin', 'check:add'],
+        edit: ['admin', 'check:edit'],
+        del: ['admin', 'check:del']
+      },
+      check_flag: true,
+      downdtl_flag: true,
+      confirm_flag: true,
+      currentRow: null,
+      storlist: []
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
+      this.storlist = res.content
+    })
+  },
+  methods: {
+    canUd(row) {
+      return row.status !== '10'
+    },
+    [CRUD.HOOK.beforeRefresh]() {
+      this.crud.query.buss_type = ''
+      this.handleCurrentChange(null)
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+        this.buttonChange(row)
+      } else if (val.length === 1) {
+        this.buttonChange(row)
+      }else{
+        this.handleCurrentChange(null)
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+      this.handleCurrentChange(null)
+    },
+    buttonChange(current) {
+      if (current !== null) {
+        this.currentRow = current
+        this.downdtl_flag = false
+        if (current.status === '10' || current.status === '30') {
+          this.check_flag = false
+        } else {
+          this.check_flag = true
+        }
+        if (current.status === '30' && current.is_nok === '1') {
+          this.confirm_flag = false
+        } else {
+          this.confirm_flag = true
+        }
+      }
+    },
+    stateFormat(row) {
+      return this.dict.label.check_bill_status[row.status]
+    },
+    bill_typeFormat(row) {
+      return this.dict.label.ST_INV_TYPE_CK[row.check_type]
+    },
+    create_modeFormat(row) {
+      return this.dict.label.ST_CREATE_MODE[row.create_mode]
+    },
+    is_nokFormat(row) {
+      if (row.is_nok === '1') {
+        return '异常'
+      } else {
+        return '正常'
+      }
+    },
+    handleCurrentChange(current) {
+      if (current === null) {
+        this.confirm_flag = true
+        this.check_flag = true
+        this.downdtl_flag = true
+        this.currentRow = null
+      }
+    },
+    checkboxT(row) {
+      return row.bill_status !== '99'
+    },
+    checkOpen() {
+      if (this.currentRow !== null) {
+        this.$refs.child.setForm(this.currentRow)
+      }
+    },
+    confirm() {
+      if (this.currentRow !== null) {
+        this.$refs.child2.setForm(this.currentRow)
+      }
+    },
+    downdtl() {
+      if (this.currentRow !== null) {
+        crud.downloadLoading = true
+        download('/api/check/download', { check_id: this.currentRow.check_id }).then(result => {
+          downloadFile(result, this.currentRow.check_code + '盘点数据', 'xlsx')
+          crud.downloadLoading = false
+        }).catch(() => {
+          crud.downloadLoading = false
+        })
+      }
+    },
+    querytable() {
+      this.onSelectAll()
+      this.crud.toQuery()
+      this.handleCurrentChange(null)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/AddDialog.vue
new file mode 100644
index 00000000..226c6b28
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/AddDialog.vue
@@ -0,0 +1,524 @@
+<template>
+  <el-dialog
+    :title="crud.status.title"
+    append-to-body
+    :before-close="crud.cancelCU"
+    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+    fullscreen
+    width="1200px"
+    @open="open"
+    @close="close"
+  >
+    <el-row v-show="crud.status.cu > 0" :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
+      <el-form-item label="单据号" prop="bill_code">
+        <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
+        <el-input v-model.trim="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="仓库" prop="stor_id">
+        <label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
+        <el-select
+          v-model="form.stor_id"
+          clearable
+          placeholder="仓库"
+          class="filter-item"
+          style="width: 210px"
+          :disabled="crud.status.view > 0"
+        >
+          <el-option
+            v-for="item in storlist"
+            :key="item.stor_id"
+            :label="item.stor_name"
+            :value="item.stor_id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="损溢类型" prop="mol_type">
+        <el-select
+          v-model="form.mol_type"
+          style="width: 210px"
+          clearable
+          class="filter-item"
+          :disabled="crud.status.view > 0"
+          @change="typeChange"
+        >
+          <el-option
+            v-for="item in dict.ST_MOL_TYPE"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="货位" prop="struct_code">
+        <label slot="label">货&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位:</label>
+        <el-input v-model.trim="form.struct_code" style="width: 210px" disabled placeholder="选择货位">
+          <el-button v-show="crud.status.view <= 0" slot="append" icon="el-icon-plus" @click="queryStruct()" />
+        </el-input>
+      </el-form-item>
+      <el-form-item label="明细数" prop="detail_count">
+        <label slot="label">明&nbsp;&nbsp;细&nbsp;数:</label>
+        <el-input v-model.trim="form.dtl_num" size="mini" disabled style="width: 210px" />
+      </el-form-item>
+      <el-form-item label="总重量" prop="total_qty">
+        <label slot="label">总&nbsp;&nbsp;重&nbsp;量:</label>
+        <el-input-number
+          v-model="form.total_qty"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
+        <el-input v-model.trim="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+      </el-form-item>
+    </el-form>
+
+    <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+    <div class="crud-opts2" style="margin-bottom: 5px;">
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <!--<el-button
+          slot="left"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-search"
+          size="mini"
+          :disabled="crud.status.view > 0"
+          @click="resetTable()"
+        >
+          重置表格
+        </el-button>-->
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          :disabled="mater_btn"
+          @click="insertdtl()"
+        >
+          新增一行
+        </el-button>
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="form.tableData"
+      style="width: 100%;"
+      size="mini"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" align="center" width="150px">
+        <template scope="scope">
+          <el-input v-show="!scope.row.edit && scope.row.is_add" v-model="scope.row.storagevehicle_code" size="mini" />
+          <span v-show="scope.row.edit">{{ scope.row.storagevehicle_code }}</span>
+          <span v-show="!scope.row.edit && !scope.row.is_add">{{ scope.row.storagevehicle_code }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column show-overflow-tooltip prop="bucketunique" label="桶号" width="190" align="center">
+        <template scope="scope">
+          <el-input v-show="!scope.row.edit && scope.row.is_add" v-model="scope.row.bucketunique" disabled class="input-with-select">
+            <el-button slot="append" icon="el-icon-plus" @click="queryBucket(scope.$index, scope.row)" />
+          </el-input>
+          <span v-show="scope.row.edit">{{ scope.row.bucketunique }}</span>
+          <span v-show="!scope.row.edit && !scope.row.is_add">{{ scope.row.bucketunique }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="material_code" label="物料编码" align="center" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="material_name" label="物料名称" align="center" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="pcsn" label="批次号" align="center" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="quality_scode" label="品质类型" align="center" width="150px">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.quality_scode"
+            size="mini"
+            clearable
+            class="filter-item"
+            disabled
+          >
+            <el-option
+              v-for="item in dict.ST_QUALITY_SCODE"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ivt_level" label="库存等级" align="center" width="150px">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.ivt_level"
+            size="mini"
+            clearable
+            class="filter-item"
+            placeholder="无"
+            disabled
+          >
+            <el-option
+              v-for="item in dict.ST_IVT_LEVEL"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column prop="is_active" label="是否可用" align="center" width="150px">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.is_active"
+            size="mini"
+            clearable
+            class="filter-item"
+            placeholder="无"
+            disabled
+          >
+            <el-option
+              v-for="item in dict.is_used"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ivt_qty" label="库存重量" align="center" :formatter="crud.formatNum3" />
+      <el-table-column prop="mol_qty" width="220" label="损溢重量" align="center">
+        <template scope="scope">
+          <el-input-number v-model="scope.row.mol_qty" :disabled="scope.row.edit" :precision="3" :controls="false" :min="0" style="width: 120px" />
+        </template>
+      </el-table-column>
+      <el-table-column prop="qty_unit_name" label="单位" align="center" />
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="190" fixed="right">
+        <template scope="scope">
+          <el-button
+            type="danger"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-delete"
+            @click.native.prevent="deleteRow(scope.$index, form.tableData)"
+          />
+          <el-button
+            v-show="!scope.row.edit"
+            type="primary"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-edit"
+            @click="handleEdit(scope.$index, scope.row)"
+          >编辑
+          </el-button>
+          <el-button
+            v-show="scope.row.edit"
+            type="success"
+            class="filter-item"
+            size="mini"
+            icon="el-icon-check"
+            @click="handleEdit(scope.$index, scope.row)"
+          >完成
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <MaterDtl :dialog-show.sync="materShow" :dialog-matertype="materType" @tableChanged2="tableChanged2" />
+    <StructDiv ref="child" :dialog-show.sync="structShow" @tableChanged="tableChanged" />
+    <BucketDialog :dialog-show.sync="bucketShow" @bucketChange="tableChanged2" />
+  </el-dialog>
+</template>
+
+<script>
+import crudOperation from '@crud/CRUD.operation'
+import BucketDialog from '@/views/wms/storage_manage/rawproduct/rawproductmoreOrless/NewBucketDialog'
+import CRUD, { crud, form } from '@crud/crud'
+import crudStorattr from '@/api/wms/basedata/st/storattr'
+import crudMoreOrless from '@/views/wms/storage_manage/rawproduct/rawproductmoreOrless/moreorless'
+import MaterDtl from '@/views/wms/pub/MaterDialog'
+import StructDiv from '@/views/wms/storage_manage/rawproduct/rawproductmoreOrless/StructDiv'
+
+const defaultForm = {
+  mol_id: '',
+  mol_code: '',
+  mol_type: '',
+  stor_id: '',
+  total_qty: '0',
+  dtl_num: '0',
+  bill_type: '',
+  remark: '',
+  struct_id: '',
+  sect_id: '',
+  sect_name: '',
+  struct_code: '',
+  struct_name: '',
+  tableData: []
+}
+
+export default {
+  name: 'AddDialog',
+  components: { crudOperation, MaterDtl, StructDiv, BucketDialog },
+  mixins: [crud(), form(defaultForm)],
+  dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_used', 'ST_MOL_TYPE'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    bussConfig: {
+      type: Object
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      materShow: false,
+      bucketShow: false,
+      structShow: false,
+      materType: '',
+      mater_btn: true,
+      storlist: [],
+      rules: {
+        stor_id: [
+          { required: true, message: '仓库不能为空', trigger: 'blur' }
+        ],
+        bill_type: [
+          { required: true, message: '业务类型不能为空', trigger: 'blur' }
+        ],
+        biz_date: [
+          { required: true, message: '业务日期不能为空', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      // 查询原材料库的仓库
+      crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
+        this.storlist = res.content
+      })
+    },
+    [CRUD.HOOK.afterToEdit]() {
+      // 获取入库单明细
+      crudMoreOrless.queryMolDtl({ 'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          row.isadd = false
+          row.edit = true
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    [CRUD.HOOK.afterToView]() {
+      this.mater_btn = true
+      crudMoreOrless.queryMolDetail({ 'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id }).then(res => {
+        this.form.tableData = res
+        // 将明细变成不可编辑
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          const row = this.form.tableData[i]
+          row.edit = true
+          this.form.tableData.splice(i, 1, row)
+        }
+      })
+    },
+    close() {
+      this.$emit('AddChanged')
+    },
+    [CRUD.HOOK.beforeSubmit]() {
+      debugger
+      // 提交前校验
+      if (this.form.tableData.length === 0) {
+        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      for (let i = 0; i < this.form.tableData.length; i++) {
+        if (!this.form.tableData[i].edit) {
+          this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
+          return false
+        }
+        const vehicle_code = this.form.tableData[i].storagevehicle_code
+        const same = this.form.tableData.some(mater => mater.storagevehicle_code !== vehicle_code)
+        if (same) {
+          this.crud.notify('存在不同载具号', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+      }
+    },
+    billTypeChange(val) {
+      this.form.tableData = []
+      this.form.total_qty = 0
+      this.form.dtl_num = 0
+    },
+    resetTable() {
+      if (!this.form.struct_id) {
+        this.crud.notify('请先选择货物！')
+        return false
+      }
+      if (this.crud.status.add > 0) {
+        crudMoreOrless.getStructIvt({ 'struct_id': this.form.struct_id }).then(res => {
+          this.form.tableData = res
+          this.form.dtl_num = this.form.tableData.length
+        })
+      }
+      if (this.crud.status.edit > 0) {
+        crudMoreOrless.queryMolDtl({ 'mol_id': this.form.mol_id, 'struct_id': this.form.struct_id }).then(res => {
+          this.form.tableData = res
+          this.form.dtl_num = this.form.tableData.length
+        })
+      }
+    },
+    tableChanged2(row) {
+      // 新增一行物料时，给行进行赋值
+      this.nowrow.material_code = row.material_code
+      this.nowrow.material_id = row.material_id
+      this.nowrow.material_name = row.material_name
+      this.nowrow.qty_unit_id = row.qty_unit_id
+      this.nowrow.qty_unit_name = row.qty_unit_name
+      this.nowrow.quality_scode = row.quality_scode
+      this.nowrow.is_active = row.is_active
+      this.nowrow.ivt_level = row.ivt_level
+      this.nowrow.pcsn = row.pcsn
+      this.nowrow.mol_qty = row.storage_qty
+      this.nowrow.bucketunique = row.bucketunique
+      this.form.tableData.splice(this.nowindex, 1, this.nowrow) // 通过splice 替换数据 触发视图更新
+    },
+    tableChanged(row) {
+      this.form.struct_id = row.struct_id
+      this.form.struct_code = row.struct_code
+      this.form.sect_id = row.sect_id
+      this.form.sect_name = row.sect_name
+      this.form.struct_name = row.struct_name
+      crudMoreOrless.getStructIvt({ 'struct_id': row.struct_id }).then(res => {
+        this.form.tableData = res
+        this.form.dtl_num = this.form.tableData.length
+      })
+    },
+
+    async queryMater(index, row) {
+      this.materShow = true
+      this.nowindex = index
+      this.nowrow = row
+    },
+    async queryStruct() {
+      if (!this.form.mol_type) {
+        this.crud.notify('请先选择损溢类型！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.structShow = true
+      this.$refs.child.getMsg(this.form.mol_type)
+    },
+    async queryBucket(index, row) {
+      this.bucketShow = true
+      this.nowindex = index
+      this.nowrow = row
+    },
+    async insertdtl() {
+      this.form.tableData.push({ quality_scode: '02', ivt_qty: 0, mol_qty: 0, is_active: '1', ivt_level: '01', edit: false, is_add: true })
+      this.form.dtl_num = this.form.tableData.length
+    },
+    typeChange(val) {
+      if (val === '1') {
+        this.mater_btn = false
+      } else {
+        this.mater_btn = true
+      }
+      this.form.tableData = []
+      this.form.struct_id = ''
+      this.form.struct_code = ''
+      this.form.sect_id = ''
+      this.form.sect_name = ''
+      this.form.struct_name = ''
+    },
+    handleEdit(index, row) {
+      if (!row.edit) {
+        if (parseFloat(row.mol_qty) <= 0) {
+          this.crud.notify('不允许损溢数量为0！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!row.material_id) {
+          this.crud.notify('物料不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!row.storagevehicle_code) {
+          this.crud.notify('载具号不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!row.bucketunique) {
+          this.crud.notify('桶号不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (!row.pcsn) {
+          this.crud.notify('批次不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        if (this.form.mol_type === '0' && (parseFloat(row.ivt_qty) < parseFloat(row.mol_qty))) {
+          this.crud.notify('不允许损数量大于库存数量！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+      }
+      // 修改行的编辑状态
+      row.edit = !row.edit
+      this.form.tableData.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
+      if (row.edit) {
+        this.form.total_qty = 0
+        this.form.tableData.forEach((item) => {
+          this.form.total_qty = this.form.total_qty + item.mol_qty
+        })
+      }
+    },
+    deleteRow(index, rows) {
+      this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].mol_qty)
+      rows.splice(index, 1)
+      this.form.dtl_num = this.form.tableData.length
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 4px 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+}
+</style>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/NewBucketDialog.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/NewBucketDialog.vue
new file mode 100644
index 00000000..6fa9ba07
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/NewBucketDialog.vue
@@ -0,0 +1,221 @@
+<template>
+  <el-dialog
+    title="桶记录选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <!-- 搜索 -->
+    <el-row>
+      <el-col :span="6">
+        <el-select
+          v-model="query.storagevehicle_type"
+          placeholder="桶类别"
+          clearable
+        >
+          <el-option
+            v-for="item in dict.MD_BUCKET_TYPE"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.bucketunique"
+          clearable
+          style="width: 200px"
+          size="mini"
+          placeholder="桶号"
+          class="filter-item"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-select
+          v-model="query.status"
+          placeholder="状态"
+          clearable
+          disabled
+        >
+          <el-option
+            v-for="item in dict.bucket_status"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-col>
+    </el-row>
+    <el-row style="padding-top: 10px;padding-bottom: 10px;">
+      <el-col :span="6">
+        <el-input
+          v-model="query.storagevehicle_code"
+          clearable
+          style="width: 200px"
+          size="mini"
+          placeholder="载具"
+          class="filter-item"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.material_search"
+          clearable
+          style="width: 200px"
+          size="mini"
+          placeholder="物料编码、名称"
+          class="filter-item"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.pcsn"
+          clearable
+          style="width: 200px"
+          size="mini"
+          placeholder="批次"
+          class="filter-item"
+        />
+      </el-col>
+      <el-col :span="6">
+        <rrOperation />
+      </el-col>
+    </el-row>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column prop="bucketunique" label="桶号" min-width="150" show-overflow-tooltip/>
+      <el-table-column prop="label" label="桶类别" />
+      <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip/>
+      <el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip/>
+      <el-table-column prop="pcsn" label="批次" />
+      <el-table-column prop="storage_qty" label="数量">
+        <template slot-scope="scope">
+          {{ fun(scope.row.storage_qty) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="qty_unit_name" label="单位" />
+      <el-table-column prop="quality_scode" :formatter="qualityFormat" label="品质类型" />
+      <el-table-column prop="ivt_level" :formatter="ivtFormat" label="库存等级" />
+      <el-table-column prop="is_active" :formatter="activeFormat" label="是否可用" />
+      <el-table-column prop="storagevehicle_code" label="载具号" />
+      <el-table-column prop="record_order" label="顺序号" />
+      <el-table-column prop="bag_qty" 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 CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import crudStructattr from '@/api/wms/basedata/st/structattr'
+import crudSectattr from '@/api/wms/basedata/st/sectattr'
+
+export default {
+  name: 'BucketDiv',
+  components: { crudOperation, rrOperation, pagination },
+  cruds() {
+    return CRUD({
+      title: '桶',
+      optShow: {},
+      query: { pcsn: '', storagevehicle_type: '', status: '01', bucketunique: '', storagevehicle_code: '', material_search: '' },
+      url: 'api/Bucket',
+      idField: 'bucket_record_id',
+      sort: 'bucket_record_id,desc',
+      crudMethod: { ...crudStructattr }
+    })
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  dicts: ['MD_BUCKET_TYPE', 'bucket_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'IS_OR_NOT'],
+  data() {
+    return {
+      sects: [],
+      classes: [],
+      dialogVisible: false,
+      bucket: {},
+      checkrow: {},
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    fun(val) {
+      return Number(val).toFixed(3)
+    },
+    open() {
+      crudSectattr.getSect().then(res => {
+        this.sects = res.content
+      })
+      this.crud.toQuery()
+    },
+    handleSelectionChange(val, row) {
+      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()
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选仓位')
+        return
+      }
+      this.$emit('update:dialogShow', false)
+      this.$emit('bucketChange', this.checkrow)
+    },
+    qualityFormat(row, column) {
+      return this.dict.label.ST_QUALITY_SCODE[row.quality_scode]
+    },
+    ivtFormat(row, column) {
+      return this.dict.label.ST_IVT_LEVEL[row.ivt_level]
+    },
+    activeFormat(row, column) {
+      return this.dict.label.IS_OR_NOT[row.is_active]
+    }
+  }
+}
+</script>
+
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/StructDiv.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/StructDiv.vue
new file mode 100644
index 00000000..0e2e1e08
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/StructDiv.vue
@@ -0,0 +1,218 @@
+<template>
+  <el-dialog
+    title="货位选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <!-- 搜索 -->
+    <el-row>
+      <el-col :span="6">
+        <el-cascader
+          v-model="query.sect"
+          placeholder="所属库区"
+          :options="sects"
+          :props="{ checkStrictly: true }"
+          clearable
+          @change="sectQueryChange"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.search"
+          clearable
+          style="width: 200px"
+          size="mini"
+          placeholder="输入货位编码、名称"
+          prefix-icon="el-icon-search"
+          class="filter-item"
+        /> </el-col>
+
+      <el-col :span="6">
+        <rrOperation />
+      </el-col>
+    </el-row>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      border
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column prop="struct_code" label="货位编码" />
+      <el-table-column prop="struct_name" label="货位名称" />
+      <el-table-column prop="sect_name" label="库区名称" />
+      <el-table-column prop="lock_type"  :formatter="lockFormat" label="是否锁定" />
+      <el-table-column prop="storagevehicle_code" 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 CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import crudStructattr from '@/api/wms/basedata/st/structattr'
+import crudSectattr from '@/api/wms/basedata/st/sectattr'
+
+export default {
+  name: 'StructDiv',
+  components: { crudOperation, rrOperation, pagination },
+  cruds() {
+    return CRUD({
+      title: '仓位',
+      optShow: {},
+      url: 'api/structattr',
+      idField: 'struct_id',
+      sort: 'struct_id,desc',
+      query: { search: '', is_lock: '1', sect_id: '', stor_id: '' },
+      crudMethod: { ...crudStructattr }
+    })
+  },
+  mixins: [presenter(), header()],
+  dicts: ['d_lock_type'],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    sectProp: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      sects: [],
+      classes: [],
+      dialogVisible: false,
+      sect: {},
+      mol_type: '',
+      checkrow: {},
+      rows: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    sectProp: {
+      handler(newValue, oldValue) {
+        this.sect = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.crud.resetQuery(false)
+      crudSectattr.getSect({ 'is_materialstore': '1' }).then(res => {
+        this.sects = res.content
+      })
+      if (this.sect) {
+        this.query.sect = this.sect
+        if (this.sect.length === 1) {
+          this.query.stor_id = this.sect[0]
+          this.query.sect_id = ''
+        }
+        if (this.sect.length === 0) {
+          this.query.sect_id = ''
+          this.query.stor_id = ''
+        }
+        if (this.sect.length === 2) {
+          this.query.stor_id = this.sect[0]
+          this.query.sect_id = this.sect[1]
+        }
+      }
+      this.query.is_used = '1'
+      this.query.is_delete = '0'
+      this.crud.toQuery()
+    },
+    sectQueryChange(val) {
+      if (val.length === 1) {
+        this.query.stor_id = val[0]
+        this.query.sect_id = ''
+      }
+      if (val.length === 0) {
+        this.query.sect_id = ''
+        this.query.stor_id = ''
+      }
+      if (val.length === 2) {
+        this.query.stor_id = val[0]
+        this.query.sect_id = val[1]
+      }
+      this.crud.toQuery()
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+        this.checkrow = row
+      } else {
+        this.checkrow = row
+      }
+    },
+    /**
+     * 接受父组件传值
+     * @param msg
+     */
+    getMsg(msg) {
+      this.mol_type = msg
+    },
+    lockFormat(row, column) {
+      return this.dict.label.d_lock_type[row.lock_type]
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.sects = null
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选仓位')
+        return
+      }
+      // 溢单不允许选择已锁定或者有载具的货位
+      if (this.mol_type === '1') {
+        if (this.checkrow.lock_type !== '00') {
+          this.$message('溢单不允许选择已锁定的货位！')
+          return
+        }
+      }
+      // 损单不允许选择已锁定或者无载具的货位
+      if (this.mol_type === '0') {
+        if (this.checkrow.lock_type !== '00') {
+          this.$message('损单不允许选择已锁定的货位！')
+          return
+        }
+        if (this.checkrow.storagevehicle_code === '') {
+          this.$message('损单不允许选择无载具的货位！')
+          return
+        }
+      }
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.checkrow)
+    }
+  }
+}
+</script>
+
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/index.vue b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/index.vue
new file mode 100644
index 00000000..7aefedda
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/index.vue
@@ -0,0 +1,297 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="模糊查询">
+            <el-input
+              v-model="query.struct_search"
+              size="mini"
+              clearable
+              placeholder="货位编码、名称"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="所属仓库">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="损溢类型">
+            <el-select
+              v-model="query.mol_type"
+              clearable
+              size="mini"
+              placeholder="损溢类型"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_MOL_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              clearable
+              size="mini"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.mol_bill_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <rrOperation />
+        </el-form>
+
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          :disabled="confirm_flag"
+          icon="el-icon-check"
+          size="mini"
+          @click="confirm"
+        >
+          确认
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        :max-height="590"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+        @current-change="handleCurrentChange"
+        @select="handleSelectionChange"
+        @select-all="onSelectAll"
+      >
+        <el-table-column
+          label="操作"
+          width="115"
+          align="center"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+              :disabled-edit="canUd(scope.row)"
+              :disabled-dle="canUd(scope.row)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column :selectable="checkboxT" type="selection" width="55" />
+        <el-table-column  prop="mol_code" min-width="140" label="损溢单号">
+          <template slot-scope="scope">
+            <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.mol_code }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column  :formatter="typeFormat" prop="mol_inv_type" label="损溢类型" />
+        <el-table-column prop="struct_name" label="货位" min-width="150" />
+        <el-table-column label="明细数" align="center" prop="dtl_num" min-width="100" />
+        <el-table-column label="重量" align="center" prop="total_qty" min-width="100" >
+          <template slot-scope="scope">
+            {{ fun(scope.row.total_qty) }}
+          </template>
+        </el-table-column>
+        <el-table-column  :formatter="stateFormat" min-width="100" prop="status" label="单据状态" />
+        <el-table-column label="备注" align="center" min-width="100" prop="remark" />
+        <el-table-column  prop="create_mode" min-width="100" :formatter="create_modeFormat" label="生成方式" />
+        <el-table-column label="制单人" align="center" min-width="100" prop="input_optname" />
+        <el-table-column label="制单时间" align="center" prop="input_time" min-width="150" />
+        <el-table-column label="确认人" align="center" prop="confirm_optname" min-width="150" />
+        <el-table-column label="确认时间" align="center" prop="confirm_time" min-width="150" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+    <AddDialog @AddChanged="querytable" />
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import AddDialog from '@/views/wms/storage_manage/rawproduct/rawproductmoreOrless/AddDialog'
+import { mapGetters } from 'vuex'
+import crudStorattr from '@/api/wms/basedata/st/storattr'
+
+export default {
+  name: 'MoreOrLess',
+  components: { AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '',
+      optShow: { add: true, reset: true},
+      props: {
+        // 每页数据条数
+        size: 20
+      },
+      idField: 'mol_id',
+      url: '/api/instor/mol',
+      crudMethod: { ...crudMoreOrless }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['mol_bill_status', 'ST_CREATE_MODE', 'ST_MOL_TYPE'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      permission: {
+        add: ['admin', 'user:add'],
+        edit: ['admin', 'user:edit'],
+        del: ['admin', 'user:del']
+      },
+      confirm_flag: true,
+      currentRow: null,
+      storlist: [],
+      statuslist: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
+      this.storlist = res.content
+    })
+  },
+  methods: {
+    fun(val) {
+      return Number(val).toFixed(3)
+    },
+    canUd(row) {
+      return row.status !== '10'
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+        this.buttonChange(row)
+      } else if (val.length === 1) {
+        this.buttonChange(row)
+      }else{
+        this.handleCurrentChange(null)
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+      this.handleCurrentChange(null)
+    },
+    buttonChange(current) {
+      if (current !== null) {
+        this.currentRow = current
+        if (current.bill_status !== '99') {
+          this.confirm_flag = false
+        } else {
+          this.confirm_flag = true
+        }
+      }
+    }
+    ,
+    querytable() {
+      this.onSelectAll()
+      this.crud.toQuery()
+      this.handleCurrentChange(null)
+    },
+    handleCurrentChange(currentRow) {
+      if (currentRow === null) {
+        this.currentRow = {}
+        this.confirm_flag = true
+      }
+    },
+    stateFormat(row, column) {
+      return this.dict.label.mol_bill_status[row.status]
+    },
+    typeFormat(row, column) {
+      return this.dict.label.ST_MOL_TYPE[row.mol_type]
+    },
+    create_modeFormat(row, column) {
+      return this.dict.label.ST_CREATE_MODE[row.create_mode]
+    },
+    checkboxT(row) {
+      return row.bill_status !== '99'
+    },
+    confirm() {
+      if (!this.currentRow) {
+        this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudMoreOrless.confirm(this.currentRow).then(res => {
+        this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.refresh()
+      })
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>
diff --git a/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/moreorless.js b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/moreorless.js
new file mode 100644
index 00000000..e7cd5c38
--- /dev/null
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawproductmoreOrless/moreorless.js
@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/instor/mol',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/instor/mol',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/instor/mol',
+    method: 'put',
+    data
+  })
+}
+
+export function getStructIvt(params) {
+  return request({
+    url: '/api/instor/mol/getStructIvt',
+    method: 'get',
+    params
+  })
+}
+
+export function queryMolDtl(params) {
+  return request({
+    url: '/api/instor/mol/queryMolDtl',
+    method: 'get',
+    params
+  })
+}
+
+export function queryMolDetail(params) {
+  return request({
+    url: '/api/instor/mol/queryMolDetail',
+    method: 'get',
+    params
+  })
+}
+
+export function confirm(data) {
+  return request({
+    url: '/api/instor/mol/confirm',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, getStructIvt, queryMolDtl, queryMolDetail, confirm }