chenlu
2024-10-23 c95ea88c3292540d4b18daab33fe5e353757ef3e
包装报工无法入库问题,自定义标签打印添加打印机选项
3个文件已修改
34 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/hook/queue.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue
@@ -23,6 +23,9 @@
let dataList = ref([])
let lastList = ref([])
let list = ref([])
//打印机
const printerData = ref()
const printerList = ref()
// 纸张类型
const paperTypes = {
  '成品标签': {
@@ -666,10 +669,11 @@
    hiprint.hiwebSocket.setHost("http://localhost:17521")
  }
  //获取打印机列表
  /*hiprint.refreshPrinterList((list) => {
    console.log('refreshPrinterList')
    console.log(list)
  });*/
  hiprint.refreshPrinterList((list) => {
    // console.log('refreshPrinterList')
    // console.log(list)
    printerList.value=list
  });
};
@@ -859,8 +863,9 @@
    object = {table:lastList.value}
    columnsNum = (list.panels[0].printElements[0].options.gridColumns || 1)
  }
  let printer=printerData.value
  if(type===1){
    const queuePrinter = new QueuePrinter( object,hiprintTemplate,columnsNum)
    const queuePrinter = new QueuePrinter( object,hiprintTemplate,columnsNum,printer)
    queuePrinter.tick
  }else{
    hiprintTemplate.value.print(object)
@@ -917,13 +922,13 @@
          </el-select>
        </el-col>
        <el-col :span="3">
          <el-select v-model="stateValue" :placeholder="$t('processCard.pleaseSelect')" allow-create class="m-2" clearable
                     filterable style="width: 140px">
          <el-select v-model="printerData" :placeholder="$t('processCard.pleaseSelect')" clearable default-value="default_city"
                     style="width: 160px">
            <el-option
                v-for="item in stateOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value"
                v-for="item in printerList"
                :key="item.displayName"
                :label="item.name"
                :value="item.name"
            />
          </el-select>
        </el-col>
north-glass-erp/northglass-erp/src/hook/queue.js
@@ -2,7 +2,7 @@
 * Queue hook
 * 打印队列方法
 */
export default function QueuePrinter(list,hiprintTemplate,columnsNum){
export default function QueuePrinter(list,hiprintTemplate,columnsNum,printer){
    const queue = JSON.parse(JSON.stringify(list));
    // 添加打印任务
    this.printJob = function(job) {
@@ -14,7 +14,8 @@
                if(typeof queue === 'object' && Array.isArray(queue)){
                    if (queue.length > 0) {
                        hiprintTemplate.value.print2(queue[0])
                        console.log(printer)
                        hiprintTemplate.value.print2(queue[0],{printer:printer})
                        queue.shift(); // 打印任务,并从队列中移除
                    }else{
                        clearInterval(this.tick)
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -344,7 +344,7 @@
            }
            //更新流程卡表的报工数量
            if (Objects.equals(reportingWork.getNextProcess(), "")) {
            if (Objects.equals(reportingWork.getNextProcess(), "")|| Objects.equals(reportingWork.getNextProcess(), null)) {
                LambdaUpdateWrapper<FlowCard> flowCardLambdaUpdateWrapper =
                        new LambdaUpdateWrapper<>();
                flowCardLambdaUpdateWrapper