Merge remote-tracking branch 'origin/master'

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/core/wql/QEM_BI_SPAREPART.wql

@@ -204,6 +204,8 @@
                 (case when dis.work_status = '01' then '生成' when dis.work_status = '99' then '完成' end) AS status_name,
                 dis.sparepart_only_id,
                 mb.material_name,
+                mb.material_spec,
+                mb.material_model,
                 dis.pcsn,
                 dis.real_qty,
                 dis.qty_unit_name,

mes/qd/src/views/wms/sb/inbill/AddDialog.vue

@@ -264,7 +264,7 @@ export default {
         this.mater_btn = true
       }
       // 查询原材料库的仓库
-      crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
+      crudStorattr.getStor({ 'is_attachment': '1' }).then(res => {
         this.storlist = res.content
         this.form.stor_id = this.storlist[0].stor_id
       })

mes/qd/src/views/wms/sb/inbill/DivDialog.vue

@@ -126,9 +126,9 @@
           slot="left"
           class="filter-item"
           type="primary"
-          icon="el-icon-delete"
+          icon="el-icon-toilet-paper"
           size="mini"
-          @click="divPoint()"
+          @click="print()"
         >
           打印
         </el-button>
@@ -165,6 +165,7 @@ import CRUD, { crud } from '@crud/crud'
 import crudSectattr from '@/api/wms/basedata/st/sectattr'
 import StructDiv from '@/views/wms/sb/inbill/StructDialog'
 import sparePart from '@/api/wms/sb/sparepart'
+import { getLodop } from '@/assets/js/lodop/LodopFuncs'
 
 export default {
   name: 'DivDialog',
@@ -220,25 +221,6 @@ export default {
       crudSectattr.getSect({ 'is_attachment': '1', 'sect_type_attr': '00' }).then(res => {
         this.sects = res.content
       })
-      /*let area_type = ''
-      if (this.billType === '000101' || this.billType === '000102' || this.billType === '000201' || this.billType === '000202' || this.billType === '000305') {
-        area_type = '\'21\''
-      }
-      if (this.billType === '000301' || this.billType === '000303' || this.billType === '000304') {
-        area_type = '\'37\''
-      }
-      if (this.billType === '000302') {
-        area_type = '\'26\',\'32\',\'33\',\'34\''
-      }
-      if (this.billType === '000601') {
-        area_type = '\'29\''
-      }
-      if (this.billType === '000401') {
-        area_type = '\'21\',\'26\',\'29\',\'31\',\'35\',\'32\',\'33\',\'34\''
-      }
-      crudPoint.getPoint({ 'area_type': area_type }).then(res => {
-        this.pointlist = res
-      })*/
     },
     toDelete(data) {
       data.pop = true
@@ -360,6 +342,31 @@ export default {
         })
       })
     },
+    print() {
+      let rows = this.$refs.dis_table.selection
+      if (rows.length === 0) {
+        this.crud.notify('请至少勾选一条记录！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      for (var i = 0; i < rows.length; i++) {
+        let row = rows[i]
+        const LODOP = getLodop()
+        LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+        // 打印纸张大小设置https://www.it610.com/article/2094844.html
+        LODOP.PRINT_INIT('')
+        LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+        LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+        LODOP.SET_PRINT_STYLE('FontSize', 9)
+        LODOP.SET_PRINT_STYLE('Bold', 1)
+        LODOP.ADD_PRINT_BARCODE('10mm', '15mm', '60mm', '20mm', '128A', row.sparepart_only_id)
+        LODOP.ADD_PRINT_TEXT('35mm', '15mm', '80mm', '15mm', '备件名称：' + row.material_name + '')
+        LODOP.ADD_PRINT_TEXT('45mm', '15mm', '80mm', '15mm', '型号：' + row.material_spec + '')
+        LODOP.PRINT()// 打印
+      }
+
+      this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      this.crud.toQuery()
+    },
     bucketChange(row) {
       debugger
       this.bucketObj = row