From 3603386c810c72bb72329341407e1b7510b179bd Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Mon, 3 Jul 2023 08:58:31 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BC=98=E5=8C=96BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/masterdata_manage/mdme.xls     | Bin 72704 -> 79360 bytes
 .../impl/SemirealrawmaterialServiceImpl.java  |   4 +-
 .../mapper/xml/PcsIfPurchaseorderMapper.xml   |  66 ++++----
 .../service/device/dao/PdmBiDevice.java       |   5 +
 .../dao/mapper/PdmProduceWorkorderMapper.xml  |   3 +
 .../service/workorder/dto/WorkorderQuery.java |   1 +
 .../main/resources/config/application-dev.yml |   8 +-
 .../master/material/index.vue                 | 142 ++++++++++--------
 .../SelectRawMaterialDialog.vue               |  59 ++++----
 .../master/semirealrawmaterial/index.vue      | 125 +++++++++++----
 .../ql/inspectionItemPoint/index.vue          |   1 +
 mes/qd/src/views/wms/pdm/device/index.vue     |  56 ++++++-
 .../rawproduct/rawProductIn/AddDtl.vue        |   2 +-
 .../rawproduct/rawProductOut/AddDialog.vue    |   2 +-
 .../rawproduct/rawProductOut/AddDtl.vue       |  24 +--
 15 files changed, 320 insertions(+), 178 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/mdme.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/mdme.xls
index 4e6443551991729238d4a22e2218bf91c2b57fdc..4a913b1b522e8219e9bd63cc67e7c1e0a9f75fff 100644
GIT binary patch
delta 17254
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
OiTA?bDgTofgZ~%I|B`b6

delta 11883
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

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/SemirealrawmaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/SemirealrawmaterialServiceImpl.java
index f43863e7..c61e0d22 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/SemirealrawmaterialServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/SemirealrawmaterialServiceImpl.java
@@ -103,9 +103,11 @@ public class SemirealrawmaterialServiceImpl implements SemirealrawmaterialServic
         String nickName = SecurityUtils.getCurrentNickName();
 
         String relation_id = param.getString("relation_id");
-        String raw_material_id = param.getString("raw_material_id");
+        String raw_material_id = param.getString("material_id");
+        String rate_qty = param.getString("rate_qty");
         JSONObject map = new JSONObject();
         map.put("raw_material_id", raw_material_id);
+        map.put("rate_qty", rate_qty);
         map.put("update_optid", currentUserId);
         map.put("update_optname", nickName);
         map.put("update_time", DateUtil.now());
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml
index d69c0330..a6727ca7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/mapper/xml/PcsIfPurchaseorderMapper.xml
@@ -8,7 +8,7 @@
 			mb.material_code,
 			mb.material_name,
 			class.class_name,
-			po.total_qty - po.instor_qty AS need_qty
+			po.qty - po.instor_qty AS need_qty
 		FROM
 			pcs_if_purchaseorder po
 		LEFT JOIN md_me_materialbase mb ON mb.material_id = po.material_id
@@ -28,38 +28,40 @@
 				and (mb.material_code = #{query.material_search} OR mb.material_name = #{query.material_search})
 			</if>
 		</where>
+		order by po.id desc
     </select>
 
 	<select id="queryAll" resultType="java.util.Map">
-		SELECT
-		po.*,
-		mb.material_code,
-		mb.material_name,
-		class.class_name
-		FROM
-		pcs_if_purchaseorder po
-		LEFT JOIN md_me_materialbase mb ON mb.material_id = po.material_id
-		LEFT JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
-		<where>
-		    po.is_delete = '0'
-			<if test="query.status == '0'.toString()">
-				and po.status = '10'
-			</if>
-			<if test="query.status == '1'.toString()">
-				and po.status > '10'
-			</if>
-			<if test="query.start_time  != null">
-				and po.ask_time >= #{query.start_time}
-			</if>
-			<if test="query.end_time  != null">
-				and #{query.end_time} >= po.ask_time
-			</if>
-			<if test="query.bill_code != null and query.bill_code != ''">
-				and mst.bill_code = #{query.bill_code}
-			</if>
-			<if test="query.material_search != null and query.material_search != ''">
-				and (mb.material_code = #{query.material_search} OR mb.material_name = #{query.material_search})
-			</if>
-		</where>
-	</select>
+        SELECT
+        po.*,
+        mb.material_code,
+        mb.material_name,
+        class.class_name
+        FROM
+        pcs_if_purchaseorder po
+        LEFT JOIN md_me_materialbase mb ON mb.material_id = po.material_id
+        LEFT JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
+        <where>
+            po.is_delete = '0'
+            <if test="query.status == '0'.toString()">
+                and po.status = '10'
+            </if>
+            <if test="query.status == '1'.toString()">
+                and po.status > '10'
+            </if>
+            <if test="query.start_time  != null">
+                and po.ask_time >= #{query.start_time}
+            </if>
+            <if test="query.end_time  != null">
+                and #{query.end_time} >= po.ask_time
+            </if>
+            <if test="query.bill_code != null and query.bill_code != ''">
+                and mst.bill_code = #{query.bill_code}
+            </if>
+            <if test="query.material_search != null and query.material_search != ''">
+                and (mb.material_code = #{query.material_search} OR mb.material_name = #{query.material_search})
+            </if>
+        </where>
+        order by po.id desc
+    </select>
 </mapper>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java
index 0748f5a5..1d9a26c6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/PdmBiDevice.java
@@ -59,6 +59,11 @@ public class PdmBiDevice implements Serializable {
      */
     private String material_id;
 
+    /**
+     * 物料系列
+     */
+    private String product_series;
+
     /**
      * 工单编号
      */
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
index 7845e6d2..856dee9c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
@@ -35,6 +35,9 @@
         <if test="query.workprocedure_code != null and query.workprocedure_code != ''">
             and pro.workprocedure_code =  #{query.workprocedure_code}
         </if>
+        <if test="query.workprocedure_codes != null and query.workprocedure_codes != ''">
+            and pro.workprocedure_code IN  #{query.workprocedure_codes}
+        </if>
         <if test="query.product_area != null and query.product_area != ''">
             and ShiftOrder.product_area =  #{query.product_area}
         </if>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java
index 5436212b..7a343cde 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java
@@ -22,6 +22,7 @@ public class WorkorderQuery extends BaseQuery<PdmProduceWorkorder> {
     private String material;
     private String order_status;
     private String workprocedure_code;
+    private String workprocedure_codes;
     private String sale_id;
     private String shift_type_scode;
     private String product_series;
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
index 53dc344d..f80fc9d1 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
@@ -23,11 +23,11 @@ spring:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_xc}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-#      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:zjhl_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+#      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_xc}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:zjhl_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
-      password: ${DB_PWD:Root.123456}
-#      password: ${DB_PWD:root}
+#      password: ${DB_PWD:Root.123456}
+      password: ${DB_PWD:root}
 
       # 初始连接数
       initial-size: 5
diff --git a/mes/qd/src/views/wms/masterdata_manage/master/material/index.vue b/mes/qd/src/views/wms/masterdata_manage/master/material/index.vue
index ac8b8c8b..2033fb27 100644
--- a/mes/qd/src/views/wms/masterdata_manage/master/material/index.vue
+++ b/mes/qd/src/views/wms/masterdata_manage/master/material/index.vue
@@ -2,39 +2,41 @@
   <div v-loading.fullscreen.lock="fullscreenLoading" class="app-container">
     <!--工具栏-->
     <div class="head-container">
-      <el-row>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="7">
-              <span style="line-height:36px;text-align: center">物料类别：</span>
-            </el-col>
-            <el-col :span="12">
-              <treeselect
-                v-model="query.material_type_id"
-                :load-options="loadChildNodes"
-                :options="classes1"
-                style="width: 200px;"
-                placeholder="请选择"
-              />
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="8">
-          模糊查询：
-          <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="8">
+      <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="物料类别"">
+            <treeselect
+              v-model="query.material_type_id"
+              :load-options="loadChildNodes"
+              :options="classes1"
+              offsetHeight = "30px;"
+              style="width: 200px; height: 30px;"
+              placeholder="请选择"
+            />
+          </el-form-item>
+
+          <el-form-item label="模糊查询">
+            <el-input
+              v-model="query.search"
+              clearable
+              style="width: 200px"
+              size="mini"
+              placeholder="输入物料编码或名称"
+              prefix-icon="el-icon-search"
+              class="filter-item"
+            />
+          </el-form-item>
           <rrOperation />
-        </el-col>
-      </el-row>
+        </el-form>
+
+      </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
         <el-button
@@ -60,19 +62,19 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="物料编码" prop="material_code">
-                <el-input v-model="form.material_code" style="width: 200px;" />
+                <el-input v-model="form.material_code" style="width: 200px;"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="物料名称" prop="material_name">
-                <el-input v-model="form.material_name" style="width: 200px;" />
+                <el-input v-model="form.material_name" style="width: 200px;"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
 
               <el-form-item label="规格" prop="material_spec">
                 <label slot="label">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</label>
-                <el-input v-model="form.material_spec" style="width: 200px;" />
+                <el-input v-model="form.material_spec" style="width: 200px;"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -80,12 +82,12 @@
             <el-col :span="8">
               <el-form-item label="型号" prop="material_model">
                 <label slot="label">型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
-                <el-input v-model="form.material_model" style="width: 200px;" />
+                <el-input v-model="form.material_model" style="width: 200px;"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="外部标识" prop="ext_id">
-                <el-input v-model="form.ext_id" style="width: 200px;" />
+                <el-input v-model="form.ext_id" style="width: 200px;"/>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -135,13 +137,13 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column prop="material_code" label="物料编码" width="160" />
-        <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
-        <el-table-column prop="material_spec" label="物料规格" width="140" />
-        <el-table-column prop="material_model" label="物料型号" />
-        <el-table-column prop="class_name" label="物料分类" width="140" />
-        <el-table-column prop="unit_name" label="计量单位" />
-        <el-table-column prop="product_series_name" label="系列" />
+        <el-table-column prop="material_code" label="物料编码" width="160"/>
+        <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip/>
+        <el-table-column prop="material_spec" label="物料规格" width="140"/>
+        <el-table-column prop="material_model" label="物料型号"/>
+        <el-table-column prop="class_name" label="物料分类" width="140"/>
+        <el-table-column prop="unit_name" label="计量单位"/>
+        <el-table-column prop="product_series_name" label="系列"/>
         <el-table-column label="启用" align="center" prop="is_used">
           <template slot-scope="scope">
             <el-switch
@@ -154,8 +156,9 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
+        <el-table-column prop="update_optname" label="修改人"/>
+        <el-table-column prop="update_time" label="修改时间"
+                         :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
         <el-table-column
           v-permission="['admin','Materialbase:edit','Materialbase:del']"
           fixed="right"
@@ -172,7 +175,7 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
     <Dialog :dialog-show.sync="dialogShow"/>
   </div>
@@ -180,13 +183,13 @@
 
 <script>
 import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import CRUD, {crud, form, 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 Dialog from '@/views/wms/masterdata_manage/master/material/Dialog'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'
 import crudMdPbMeasureunit from '@/api/wms/basedata/master/mdPbMeasureunit'
@@ -229,16 +232,16 @@ export default {
   name: 'Materialbase',
   // 数据字典
   dicts: ['is_used'],
-  components: { pagination, crudOperation, rrOperation, udOperation, Treeselect, Dialog },
+  components: {pagination, crudOperation, rrOperation, udOperation, Treeselect, Dialog},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
       title: '物料',
-      optShow: { add: true, reset: true },
+      optShow: {add: true, reset: true},
       url: 'api/Materialbase',
       idField: 'material_id',
       sort: 'material_id,desc',
-      crudMethod: { ...crudMaterialbase }
+      crudMethod: {...crudMaterialbase}
     })
   },
   data() {
@@ -253,28 +256,28 @@ export default {
       permission: {},
       rules: {
         material_id: [
-          { required: true, message: '不能为空', trigger: 'blur' }
+          {required: true, message: '不能为空', trigger: 'blur'}
         ],
         material_code: [
-          { required: true, message: '物料编码不能为空', trigger: 'blur' }
+          {required: true, message: '物料编码不能为空', trigger: 'blur'}
         ],
         material_name: [
-          { required: true, message: '物料名称不能为空', trigger: 'blur' }
+          {required: true, message: '物料名称不能为空', trigger: 'blur'}
         ],
         material_type_id: [
-          { required: true, message: '物料分类不能为空', trigger: 'blur' }
+          {required: true, message: '物料分类不能为空', trigger: 'blur'}
         ],
         create_id: [
-          { required: true, message: '不能为空', trigger: 'blur' }
+          {required: true, message: '不能为空', trigger: 'blur'}
         ],
         create_time: [
-          { required: true, message: '不能为空', trigger: 'blur' }
+          {required: true, message: '不能为空', trigger: 'blur'}
         ],
         is_used: [
-          { required: true, message: '是否启用不能为空', trigger: 'blur' }
+          {required: true, message: '是否启用不能为空', trigger: 'blur'}
         ],
         material_height_type: [
-          { required: true, message: '不能为空', trigger: 'blur' }
+          {required: true, message: '不能为空', trigger: 'blur'}
         ]
       }
     }
@@ -404,10 +407,10 @@ export default {
       })
     },
     // 获取子节点数据
-    loadChildNodes({ action, parentNode, callback }) {
+    loadChildNodes({action, parentNode, callback}) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
+        crudClassstandard.getClass({pid: parentNode.id}).then(res => {
+          parentNode.children = res.content.map(function (obj) {
             if (obj.hasChildren) {
               obj.children = null
             }
@@ -423,6 +426,17 @@ export default {
 }
 </script>
 
-<style scoped>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.treeselect-main {
+  width: 204px;
+  line-height: 28px;
+  .vue-treeselect__placeholder {
+    line-height: 28px;
+  }
+  .vue-treeselect__control {
+    height: 28px !important;
+  }
+}
 
 </style>
+
diff --git a/mes/qd/src/views/wms/masterdata_manage/master/semirealrawmaterial/SelectRawMaterialDialog.vue b/mes/qd/src/views/wms/masterdata_manage/master/semirealrawmaterial/SelectRawMaterialDialog.vue
index 022b0530..afd0a189 100644
--- a/mes/qd/src/views/wms/masterdata_manage/master/semirealrawmaterial/SelectRawMaterialDialog.vue
+++ b/mes/qd/src/views/wms/masterdata_manage/master/semirealrawmaterial/SelectRawMaterialDialog.vue
@@ -33,7 +33,7 @@
           @keyup.enter.native="crud.toQuery"
         />
       </el-form-item>
-      <rrOperation />
+      <rrOperation/>
     </el-form>
 
     <!--表格渲染-->
@@ -49,29 +49,29 @@
       @select-all="onSelectAll"
       @current-change="clickChange"
     >
-      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <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>
+          <el-radio v-model="tableRadio" :label="scope.row"><i/></el-radio>
         </template>
       </el-table-column>
 
-      <el-table-column prop="material_code" label="原材料编码" min-width="150" show-overflow-tooltip />
-      <el-table-column prop="material_name" label="原材料名称" min-width="200" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="原材料规格" show-overflow-tooltip />
-      <el-table-column prop="material_model" label="型号" />
-      <el-table-column prop="class_code" label="分类编码" />
-      <el-table-column prop="class_name" label="物料分类" />
+      <el-table-column prop="material_code" label="原材料编码" min-width="150" show-overflow-tooltip/>
+      <el-table-column prop="material_name" label="原材料名称" min-width="200" show-overflow-tooltip/>
+      <el-table-column prop="material_spec" label="原材料规格" show-overflow-tooltip/>
+      <el-table-column prop="material_model" label="型号"/>
+      <el-table-column prop="class_code" label="分类编码"/>
+      <el-table-column prop="class_name" label="物料分类"/>
       <el-table-column
         show-overflow-tooltip
         min-width="100"
         prop="product_series_name"
         label="系列"
       />
-      <el-table-column prop="unit_name" label="计量单位" />
+      <el-table-column prop="unit_name" label="计量单位"/>
     </el-table>
     <!--分页组件-->
-    <pagination />
+    <pagination/>
     <span slot="footer" class="dialog-footer">
       <el-button @click="dialogVisible = false">取 消</el-button>
       <el-button type="primary" @click="submit">确 定</el-button>
@@ -82,19 +82,28 @@
 <script>
 
 import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
-import CRUD, { header, presenter } from '@crud/crud'
+import CRUD, {header, presenter} from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'
 import crudSemirealrawmaterial from '@/api/wms/basedata/master/semirealrawmaterial'
 
 export default {
   name: 'SelectRawMaterialDialog',
-  components: { rrOperation, pagination, Treeselect },
+  components: {rrOperation, pagination, Treeselect},
   cruds() {
-    return CRUD({ title: '物料', url: 'api/Materialbase', crudMethod: { ...crudMaterialbase }, optShow: {}})
+    return CRUD({
+      title: '物料',
+      url: 'api/Materialbase',
+      query: {
+        class_idStr: '1503644349995552768',
+        material_type_id: '1503644349995552768'
+      },
+      crudMethod: { ...crudMaterialbase },
+      optShow: {}}
+    )
   },
   mixins: [presenter(), header()],
   dicts: ['product_series'],
@@ -183,23 +192,13 @@ export default {
       this.$emit('tableChanged3', this.tableRadio)
     },
     submit() {
-      // 处理单选
-      if (this.isSingle && this.tableRadio) {
-        crudSemirealrawmaterial.updateRawmaterial({ relation_id: this.relation_id, raw_material_id: this.tableRadio.material_id }).then(res => {
-          this.$emit('update:dialogShow', false)
-          this.$emit('tableChanged3', this.tableRadio)
-        })
-      } else {
-        crudSemirealrawmaterial.updateRawmaterial({ relation_id: this.relation_id, raw_material_id: '' }).then(res => {
-          this.$emit('update:dialogShow', false)
-          this.$emit('tableChanged3', this.tableRadio)
-        })
-      }
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged3', this.tableRadio)
     },
-    loadClass({ action, parentNode, callback }) {
+    loadClass({action, parentNode, callback}) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
+        crudClassstandard.getClass({pid: parentNode.id}).then(res => {
+          parentNode.children = res.content.map(function (obj) {
             if (obj.hasChildren) {
               obj.children = null
             }
diff --git a/mes/qd/src/views/wms/masterdata_manage/master/semirealrawmaterial/index.vue b/mes/qd/src/views/wms/masterdata_manage/master/semirealrawmaterial/index.vue
index c1729792..df2a31d0 100644
--- a/mes/qd/src/views/wms/masterdata_manage/master/semirealrawmaterial/index.vue
+++ b/mes/qd/src/views/wms/masterdata_manage/master/semirealrawmaterial/index.vue
@@ -3,11 +3,45 @@
     <!-- 半成品列表-->
     <!--工具栏-->
     <div class="head-container">
-        <!-- 搜索 -->
-        <label class="el-form-item-label">模糊搜索</label>
-        <el-input v-model="query.search" clearable size="small" placeholder="输入编码或者名称" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-        <rrOperation />
+      <!-- 搜索 -->
+      <label class="el-form-item-label">模糊搜索</label>
+      <el-input v-model="query.search" clearable size="small" placeholder="输入编码或者名称" style="width: 200px;"
+                class="filter-item" @keyup.enter.native="crud.toQuery"/>
+      <rrOperation/>
+    </div>
+
+    <el-dialog
+      :close-on-click-modal="false"
+      :visible.sync="selectRawMaterialDialog2"
+      title="扩展属性维护"
+      width="1000px"
+    >
+      <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="物料" prop="material_code">
+              <el-input
+                v-model="form.material_code"
+                style="width: 280px;"
+                clearable
+                placeholder="点击进行选择物料"
+                @focus="selectRawMaterialDialog = true"
+                @clear="form.material_id =''"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所需原料（g）" prop="rate_qty">
+              <el-input-number v-model.number="form.rate_qty" style="width: 280px;"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="text" @click="selectRawMaterialDialog2 = false">取消</el-button>
+        <el-button :loading="crud.cu === 2" type="primary" @click="submit">确认</el-button>
       </div>
+    </el-dialog>
     <!--表格渲染-->
     <el-table
       ref="table"
@@ -20,42 +54,55 @@
       :header-cell-style="{'text-align':'center'}"
       @selection-change="crud.selectionChangeHandler"
     >
-      <el-table-column prop="material_code" label="半成品编码" :min-width="100" show-overflow-tooltip />
-      <el-table-column prop="material_name" label="半成品名称" :min-width="180" show-overflow-tooltip />
-      <el-table-column prop="material_spec" label="半成品规格" :min-width="150" show-overflow-tooltip />
-      <el-table-column prop="class_name" label="半成品系列" :min-width="100" show-overflow-tooltip />
-      <el-table-column prop="ymaterial_code" label="对应原材料编码" :min-width="120" show-overflow-tooltip />
-      <el-table-column prop="ymaterial_name" label="对应原材料名称" :min-width="180" show-overflow-tooltip />
-      <el-table-column prop="ymaterial_spec" label="对应原材料规格" :min-width="180" show-overflow-tooltip />
-      <el-table-column prop="yclass_name" label="对应原材料系列" :min-width="120" show-overflow-tooltip />
+      <el-table-column prop="material_code" label="半成品编码" :min-width="100" show-overflow-tooltip/>
+      <el-table-column prop="material_name" label="半成品名称" :min-width="180" show-overflow-tooltip/>
+      <el-table-column prop="material_spec" label="半成品规格" :min-width="150" show-overflow-tooltip/>
+      <el-table-column prop="class_name" label="半成品系列" :min-width="100" show-overflow-tooltip/>
+      <el-table-column prop="ymaterial_code" label="对应原材料编码" :min-width="120" show-overflow-tooltip/>
+      <el-table-column prop="ymaterial_name" label="对应原材料名称" :min-width="180" show-overflow-tooltip/>
+      <el-table-column prop="ymaterial_spec" label="对应原材料规格" :min-width="180" show-overflow-tooltip/>
+      <el-table-column prop="yclass_name" label="对应原材料系列" :min-width="120" show-overflow-tooltip/>
+      <el-table-column prop="rate_qty" label="所需原料（g）" :min-width="120" show-overflow-tooltip/>
       <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addMaterial(scope.row)">添加原材料</el-button>
+          <el-button type="text" size="small" @click="addMaterial(scope.row)">扩展属性维护</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!--分页组件-->
-    <pagination />
-    <SelectRawMaterialDialog ref="selectRawMaterialDialog" :dialog-show.sync="selectRawMaterialDialog" @tableChanged3="tableChanged3"/>
+    <pagination/>
+    <SelectRawMaterialDialog ref="selectRawMaterialDialog" :dialog-show.sync="selectRawMaterialDialog"
+                             @tableChanged3="tableChanged3"/>
   </div>
 </template>
 
 <script>
 import crudSemirealrawmaterial from '@/api/wms/basedata/master/semirealrawmaterial'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import CRUD, {presenter, header, form, crud} from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import SelectRawMaterialDialog from './SelectRawMaterialDialog'
 
-const defaultForm = { relation_id: null, semi_material_id: null, raw_material_id: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
+const defaultForm = {
+  relation_id: null,
+  semi_material_id: null,
+  raw_material_id: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null
+}
 
 export default {
   name: 'Semirealrawmaterial',
-  components: { pagination, crudOperation, rrOperation, SelectRawMaterialDialog },
+  components: {pagination, crudOperation, rrOperation, SelectRawMaterialDialog},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
-    return CRUD({ title: '半成品对应原材料', url: 'api/semirealrawmaterial', idField: 'relation_id', sort: 'relation_id,desc',
+    return CRUD({
+      title: '半成品对应原材料', url: 'api/semirealrawmaterial', idField: 'relation_id', sort: 'relation_id,desc',
       optShow: {
         add: false,
         edit: false,
@@ -63,28 +110,52 @@ export default {
         download: false,
         reset: false
       },
-      crudMethod: { ...crudSemirealrawmaterial }})
+      crudMethod: {...crudSemirealrawmaterial}
+    })
   },
   data() {
     return {
       selectRawMaterialDialog: false,
-      permission: {
+      selectRawMaterialDialog2: false,
+      form: {
+        material_code: '',
+        material_id: '',
+        relation_id: '',
+        rate_qty: ''
       },
-      rules: {
-      }
+      permission: {},
+      rules: {}
     }
   },
   methods: {
     addMaterial(row) {
-      this.$refs.selectRawMaterialDialog.setForm(row.relation_id)
-      this.selectRawMaterialDialog = true
-      this.$refs.selectRawMaterialDialog.crud.toQuery()
+      this.form.relation_id = row.relation_id
+      this.selectRawMaterialDialog2 = true
     },
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-    tableChanged3() {
+    tableChanged3(row) {
+      this.form.material_id = row.material_id
+      this.form.material_code = row.material_code
+    },
+    submit() {
+      if (this.form.relation_id === '') {
+        this.crud.notify('请选择一条要设置的半成品', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.form.material_id === '') {
+        this.crud.notify('请设置物料', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.form.rate_qty === '') {
+        this.crud.notify('请设置重量比例', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudSemirealrawmaterial.updateRawmaterial(this.form).then(res => {
+        this.selectRawMaterialDialog2 = false
+      })
       this.crud.toQuery()
     }
   }
diff --git a/mes/qd/src/views/wms/masterdata_manage/ql/inspectionItemPoint/index.vue b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionItemPoint/index.vue
index 64ffbaa9..38ead090 100644
--- a/mes/qd/src/views/wms/masterdata_manage/ql/inspectionItemPoint/index.vue
+++ b/mes/qd/src/views/wms/masterdata_manage/ql/inspectionItemPoint/index.vue
@@ -201,6 +201,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
+import crudSemirealrawmaterial from "@/api/wms/basedata/master/semirealrawmaterial";
 
 const defaultForm = {
   inspection_item_id: null,
diff --git a/mes/qd/src/views/wms/pdm/device/index.vue b/mes/qd/src/views/wms/pdm/device/index.vue
index 4132c00e..ce779152 100644
--- a/mes/qd/src/views/wms/pdm/device/index.vue
+++ b/mes/qd/src/views/wms/pdm/device/index.vue
@@ -121,6 +121,17 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="产品系列">
+            <treeselect
+              v-model="form.product_series"
+              :options="classes3"
+              :multiple="true"
+              :auto-load-root-options="false"
+              :load-options="loadChildNodes"
+              style="width: 200px;"
+              placeholder="请选择"
+            />
+          </el-form-item>
           <el-form-item label="生产物料规格">
             <el-input v-model="form.spec" style="width: 200px;" />
           </el-form-item>
@@ -212,6 +223,9 @@ import pagination from '@crud/Pagination'
 import DeviceItemDialog from '@/views/wms/pdm/device/DeviceItemDialog'
 import DeviceInfoDialog from '@/views/wms/pdm/device/DeviceInfoDialog'
 import CopyDialog from '@/views/wms/pdm/device/CopyDialog'
+import crudClassstandard from "@/api/wms/basedata/master/classstandard"
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
 
 const defaultForm = {
   device_code: null,
@@ -219,6 +233,7 @@ const defaultForm = {
   product_area: 'A1',
   workprocedure_id: null,
   ext_code: null,
+  product_series: null,
   material_id: null,
   workorder_code: null,
   device_code2: null,
@@ -241,7 +256,7 @@ const defaultForm = {
 }
 export default {
   name: 'Device',
-  components: { pagination, crudOperation, rrOperation, udOperation, DeviceItemDialog, CopyDialog, DeviceInfoDialog },
+  components: {Treeselect, pagination, crudOperation, rrOperation, udOperation, DeviceItemDialog, CopyDialog, DeviceInfoDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['is_used', 'IS_OR_NOT', 'product_area'],
   cruds() {
@@ -268,7 +283,7 @@ export default {
       permission: {
       },
       trueorfalse: [ { value: true, label: '是' }, { value: false, label: '否' }],
-
+      classes3: [],
       workList: [],
       tableLabel: [],
       rules: {
@@ -310,6 +325,7 @@ export default {
   },
   created() {
     this.getWorkprocedure()
+    this.initClass3()
   },
   methods: {
     changeHeader(search, workprocedure_id) {
@@ -323,6 +339,26 @@ export default {
     format_is_used(is_used) {
       return is_used === '1'
     },
+    initClass3() {
+      const param = {
+        parent_class_code: '07'
+      }
+      crudClassstandard.getClassType(param).then(res => {
+        const data = res.content
+        this.buildTree(data)
+        this.classes3 = data
+      })
+    },
+    buildTree(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildTree(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null // 重点代码
+        }
+      })
+    },
     changeEnabled(data, val) {
       this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.device_code + ', 是否继续？', '提示', {
         confirmButtonText: '确定',
@@ -372,6 +408,22 @@ export default {
       const d = JSON.parse(JSON.stringify(data))
       this.$refs.copyChiled.setForm(d)
     },
+    // 获取子节点数据
+    loadChildNodes({action, parentNode, callback}) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({pid: parentNode.id}).then(res => {
+          parentNode.children = res.content.map(function (obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
     querytable() {
       this.crud.toQuery()
     }
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
index c55809a6..b45c2f9d 100644
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDtl.vue
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/AddDtl.vue
@@ -64,7 +64,7 @@
         <el-table-column show-overflow-tooltip prop="material_code" width="250" label="物料编号" />
         <el-table-column show-overflow-tooltip width="100" prop="material_name" label="物料名称" />
         <el-table-column show-overflow-tooltip width="150" prop="class_name" label="物料类别" />
-        <el-table-column show-overflow-tooltip width="150" prop="total_qty" label="重量" />
+        <el-table-column show-overflow-tooltip width="150" prop="qty" label="重量" />
         <el-table-column show-overflow-tooltip width="170" prop="need_qty" label="待入重量" />
         <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
       </el-table>
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
index fd820417..916b7f47 100644
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDialog.vue
@@ -249,7 +249,7 @@
 <script>
 import CRUD, { crud, form } from '@crud/crud'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
-import BillDtl from '@/views/wms/storage_manage/rawproduct/rawProductIn/AddDtl'
+import BillDtl from '@/views/wms/storage_manage/rawproduct/rawProductOut/AddDtl'
 import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
 import crudProductOut from '@/views/wms/storage_manage/rawproduct/rawProductOut/rawproductout'
 import crudStructattr from '@/api/wms/basedata/st/structattr'
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
index 7ed7239d..3727a03a 100644
--- a/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDtl.vue
+++ b/mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/AddDtl.vue
@@ -59,15 +59,12 @@
         @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="批次"/>
-        <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 width="150" prop="planproducestart_date" label="日期"/>
+        <el-table-column show-overflow-tooltip width="150" prop="workorder_code" label="单据号"/>
+        <el-table-column show-overflow-tooltip prop="material_code" width="250" label="物料编号"/>
+        <el-table-column show-overflow-tooltip width="100" prop="material_name" label="物料名称"/>
+        <el-table-column show-overflow-tooltip width="150" prop="pcsn" label="批次"/>
+        <el-table-column show-overflow-tooltip width="150" prop="plan_qty" label="重量"/>
         <el-table-column show-overflow-tooltip prop="width" label="重量单位"/>
       </el-table>
       <!--分页组件-->
@@ -97,7 +94,7 @@ export default {
   cruds() {
     return CRUD({
       title: '用户',
-      url: '/api/in/rawAssist/getBillDtl',
+      url: '/api/produceWorkorder',
       crudMethod: {},
       optShow: {
         reset: true
@@ -130,7 +127,6 @@ export default {
   },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
-      this.crud.query.bill_type = '0001'
       return true
     },
     objectSpanMethod({row, column, rowIndex, columnIndex}) {
@@ -155,13 +151,9 @@ export default {
       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.$emit('tableChanged', this.rows)
       // this.form = this.$options.data().form
     }
   }