diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
index 9b1318a..fd58d20 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml
@@ -40,7 +40,6 @@
             w.workorder_code,
             w.point_code AS device_code,
             w.plan_qty,
-            IF(w.region_code = 'HN',m.raw_material_code,m.half_material_code) AS material_code,
             m.product_code AS product_code,
             m.material_spec AS brick_code,
             m.material_model AS formula,
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/pressedOrder.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/pressedOrder.vue
index 52fd411..51f4cd5 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/pressedOrder.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/pressedOrder.vue
@@ -378,14 +378,14 @@
 <!--          :min-width="flexWidth('half_material_code',crud.data,'半成品编码')"-->
 <!--        />-->
         <el-table-column
-          prop="raw_material_code"
+          prop="material_name"
           label="物料名称"
-          :min-width="flexWidth('raw_material_code',crud.data,'物料名称')"
+          :min-width="flexWidth('material_name',crud.data,'物料名称')"
         />
         <el-table-column
-          prop="material_name"
+          prop="material_code"
           label="产品牌号"
-          :min-width="flexWidth('material_name',crud.data,'产品牌号')"
+          :min-width="flexWidth('material_code',crud.data,'产品牌号')"
         />
         <el-table-column
           prop="material_spec"
diff --git a/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue b/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
index cea6a03..1958eea 100644
--- a/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
@@ -69,10 +69,10 @@
       </el-table-column>
       <el-table-column prop="order_number" label="订单编号" width="160"/>
       <el-table-column prop="product_code" label="产品编码" width="160" />
-      <el-table-column prop="material_code" label="物料名称" width="160" />
+      <el-table-column prop="material_name" label="物料名称" width="160" />
 <!--      <el-table-column prop="half_material_code" label="半成品编码" width="160" />-->
 <!--      <el-table-column prop="raw_material_code" label="泥料编码" width="160" />-->
-      <el-table-column prop="material_name" label="产品牌号" width="180" show-overflow-tooltip />
+      <el-table-column prop="material_code" label="产品牌号" width="180" show-overflow-tooltip />
       <el-table-column prop="material_spec" label="产品部位" width="140" />
       <el-table-column prop="material_model" label="物料型号" width="140" />
       <el-table-column prop="pack_method" label="包装方式" width="140" />