Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductCheck/ProcessDialog.vue

@@ -115,9 +115,9 @@
       <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 show-overflow-tooltip 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" />

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/AddDialog.vue

@@ -72,7 +72,7 @@
           :disabled="crud.status.view > 0"
         >
           <el-option
-            v-for="item in dict.bill_type"
+            v-for="item in dict.ST_INV_BCP_IN_TYPE"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -246,7 +246,7 @@ export default {
   name: 'AddDialog',
   components: {MaterDtl},
   mixins: [crud(), form(defaultForm)],
-  dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'bill_type', 'product_area'],
+  dicts: ['IO_BILL_STATUS', 'ST_QUALITY_SCODE', 'ST_INV_BCP_IN_TYPE', 'product_area'],
   cruds() {
     return CRUD({title: '入库新增', crudMethod: {...crudsemiproductIn}})
   },

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/ViewDialog.vue

@@ -51,7 +51,7 @@
           @change="crud.toQuery"
         >
           <el-option
-            v-for="item in dict.ST_INV_IN_TYPE"
+            v-for="item in dict.ST_INV_BCP_IN_TYPE"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -140,7 +140,7 @@ export default {
   name: 'ViewDialog',
   components: { },
   mixins: [crud()],
-  dicts: ['ST_INV_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status'],
+  dicts: ['ST_INV_BCP_IN_TYPE', 'product_area', 'IO_BILL_STATUS', 'task_status'],
   props: {
     dialogShow: {
       type: Boolean,

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIn/index.vue

@@ -40,7 +40,7 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.ST_INV_IN_TYPE"
+                v-for="item in dict.ST_INV_BCP_IN_TYPE"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -221,7 +221,7 @@ export default {
   },
   mixins: [presenter(), header(), crud()],
   // 数据字典
-  dicts: ['IO_BILL_STATUS', 'bill_type', 'product_area', 'ST_INV_IN_TYPE', 'ST_INV_CREATE'],
+  dicts: ['IO_BILL_STATUS', 'product_area', 'ST_INV_BCP_IN_TYPE', 'ST_INV_CREATE'],
   data() {
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
@@ -301,7 +301,7 @@ export default {
       }
     },
     bill_typeFormat(row, column) {
-      return this.dict.label.bill_type[row.bill_type]
+      return this.dict.label.ST_INV_BCP_IN_TYPE[row.bill_type]
     },
     toView(row) {
       this.mstrow = row

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/AddDialog.vue

@@ -112,16 +112,15 @@
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="100" align="center" />
       <el-table-column prop="material_name" label="物料名称" align="center" min-width="120" />
-      <el-table-column show-overflow-tooltip prop="pcsn" label="批次" width="110px" />
-      <el-table-column show-overflow-tooltip prop="turnout_struct_code" label="移出货位" />
-      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="移出载具号" width="90" />
-      <el-table-column show-overflow-tooltip prop="qty" label="移出重量" width="120" align="center" :formatter="crud.formatNum3" />
+      <el-table-column prop="material_spec" label="物料规格" align="center" min-width="120" />
+      <el-table-column show-overflow-tooltip prop="turnout_struct_code" label="移出货位1" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="移出载具1" width="90" />
+      <el-table-column show-overflow-tooltip prop="fact_qty" label="移出重量1" width="120" align="center" :formatter="crud.formatNum3" />
+      <el-table-column show-overflow-tooltip prop="turnin_struct_code" label="移出货位2" />
+      <el-table-column show-overflow-tooltip prop="storagevehicle_code_in" label="移出载具2" width="90" />
+      <el-table-column show-overflow-tooltip prop="qty" label="移出重量2" width="120" align="center" :formatter="crud.formatNum3" />
       <el-table-column prop="qty_unit_name" label="重量单位" align="center" />
-      <el-table-column show-overflow-tooltip prop="turnin_struct_code" label="移入货位" />
-      <el-table-column show-overflow-tooltip prop="storagevehicle_code_in" label="移入载具号" width="90" />
-      <el-table-column prop="quality_scode" label="品质类型" align="center" width="110px" :formatter="quality_scodeFormat" />
-      <el-table-column prop="ivt_level" label="库存等级" align="center" width="100px" :formatter="ivt_levelFormat" />
-      <el-table-column prop="is_active" label="是否可用" align="center" width="110px" :formatter="is_activeFormat" />
+      <el-table-column prop="work_status" label="状态" align="center" :formatter="formatWorkStatus" />
     </el-table>
     <el-row v-if="crud.status.cu > 0" :gutter="2">
       <el-col :span="12">
@@ -209,7 +208,7 @@ export default {
       default: false
     }
   },
-  dicts: ['SHUTFRAME_BILL_STATUS', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_usable', 'ST_INV_TYPE_SF'],
+  dicts: ['SHUTFRAME_BILL_STATUS', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_usable', 'ST_INV_TYPE_SF','SHUTFRAME_BILLDTL_STATUS'],
   data() {
     return {
       dialogVisible: false,
@@ -254,13 +253,16 @@ export default {
       })
     },
     [CRUD.HOOK.afterToView]() {
-      shutframe.getOutBillDtl({ 'shutframeinv_id': this.form.shutframeinv_id }).then(res => {
+      shutframe.getBillDtlView({ 'shutframeinv_id': this.form.shutframeinv_id }).then(res => {
         this.form.tableData = res
       })
     },
     quality_scodeFormat(row) {
       return this.dict.label.ST_QUALITY_SCODE[row.quality_scode]
     },
+    formatWorkStatus(row) {
+      return this.dict.label.SHUTFRAME_BILLDTL_STATUS[row.work_status]
+    },
     ivt_levelFormat(row) {
       return this.dict.label.ST_IVT_LEVEL[row.ivt_level]
     },

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductShutFrame/shutframe.js

@@ -119,6 +119,14 @@ export function allCancel(data) {
   })
 }
 
+export function getBillDtlView(data) {
+  return request({
+    url: '/api/shutframe/getBillDtlView',
+    method: 'post',
+    data
+  })
+}
+
 export default {
   add,
   edit,
@@ -132,5 +140,6 @@ export default {
   getInvTypes,
   getOutBillDtl2,
   issueTask,
-  getStruct
+  getStruct,
+  getBillDtlView
 }