Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

2025-09-17 de53e1783b5a05d9358aa648e0dfd22977ff7441

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

 north-glass-erp/northglass-erp/src/components/pp/TagStyleDesigner.vue

@@ -986,7 +986,7 @@
    const queuePrinter = new QueuePrinter( object,hiprintTemplate,columnsNum,printer)
    queuePrinter.tick
  }else{
      hiprintTemplate.value.print(object)
    hiprintTemplate.value.print(object)
  }

  hiprintTemplate.value.update(restore)

 north-glass-erp/northglass-erp/src/components/sd/order/OrderCraftDetail.vue

@@ -3,6 +3,7 @@
import {changeFilterEvent, filterChanged} from "@/hook"
import {useI18n} from "vue-i18n"
import request from "@/utils/request"
import {copyTableCellValue} from "@/hook/copyTableCellValue";
const { t } = useI18n()
const xGrid = ref()
const gridOptions = reactive({
@@ -93,6 +94,11 @@

  }
}
const gridEvents = {
  cellDblclick ({row,column}) {
    copyTableCellValue(row,column)
  }
}
</script>

<template>
@@ -104,6 +110,7 @@
        ref="xGrid"
        v-bind="gridOptions"
        @keydown="handleKeyDown"
        v-on="gridEvents"
    >
      <template #num1_filter="{ column, $panel }">
        <div>
@@ -125,5 +132,12 @@
</template>

<style scoped>

.vxe-grid {
  /* 禁用浏览器默认选中 */
  -webkit-user-select: none;
  -moz-user-select: none;
  -ms-user-select: none;
  user-select: none;
  transform: translateZ(0);
}
</style>

 north-glass-erp/northglass-erp/src/components/sd/order/OrderDetail.vue

@@ -5,6 +5,7 @@
import request from "@/utils/request"
import footSum from "@/hook/footSum";
import {addListener,destroyAreaBox} from "@/hook/mouseMoveHomePage";
import {copyTableCellValue, copyTableCellValueShow} from "@/hook/copyTableCellValue";
const { t } = useI18n()
const xGrid = ref()
const gridOptions = reactive({
@@ -87,6 +88,12 @@
let props = defineProps({
  orderId:null
})

const gridEvents = {
  cellDblclick ({row,column}) {
    copyTableCellValue(row,column)
  }
}
onMounted(async ()=>{
  await getColumns()
  await getDetail()
@@ -155,6 +162,7 @@
        ref="xGrid"
        v-bind="gridOptions"
        @keydown="handleKeyDown"
        v-on="gridEvents"
    >
      <template #num1_filter="{ column, $panel }">
        <div>

 north-glass-erp/northglass-erp/src/components/sd/order/OrderProcessCollect.vue

@@ -4,6 +4,7 @@
import {useI18n} from "vue-i18n"
import request from "@/utils/request"
import {ElMessage} from "element-plus"
import {copyTableCellValue} from "@/hook/copyTableCellValue";
const { t } = useI18n()
const xGrid = ref()
const gridOptions = reactive({
@@ -198,6 +199,12 @@
      +')' )
  //return
}

const gridEvents = {
  cellDblclick ({row,column}) {
    copyTableCellValue(row,column)
  }
}
</script>

<template>
@@ -209,6 +216,7 @@
        class="mytable-scrollbar"
        ref="xGrid"
        v-bind="gridOptions"
        v-on="gridEvents"
    >
      <template #num1_filter="{ column, $panel }">
        <div>
@@ -238,5 +246,12 @@
::v-deep(.vxe-grid .vxe-body--column.row-green) {
  background-color: #D5EAFF;
}

.vxe-grid {
  /* 禁用浏览器默认选中 */
  -webkit-user-select: none;
  -moz-user-select: none;
  -ms-user-select: none;
  user-select: none;
  transform: translateZ(0);
}
</style>

 north-glass-erp/northglass-erp/src/hook/createTemplateTag.js

@@ -102,8 +102,6 @@
        printData
    }



}



 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java

@@ -194,4 +194,14 @@
    public Result saveWorkStorage( @RequestBody Map<String,Object>  object){
        return Result.seccess(reportingWorkService.saveWorkStorage(object));

    }}
    }

    @ApiOperation("Mes报工基础数据")
    @PostMapping  ("/mesBasicData")
    public Result mesBasicData()  {
        return  Result.seccess(reportingWorkService.mesBasicDataSv());
    }

}



 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java

@@ -106,4 +106,8 @@
    Integer selectReviewedState(String reportingWorkId);

    List<ReportingWork> qualityReviewSearchMp();

    List<BasicDataProduce> mesSelectWorkBasicDeviceMp();

    List<Map<String,String>> mesSelectWorkBasicTeamsMp();
}

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java

@@ -1259,4 +1259,20 @@
            //List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData();
            //finishedGoodsInventoryService.addSelectWarehousing(object);
            return null;
        }}
        }

    public Map<String, Object> mesBasicDataSv() {
        Map<String, Object> map = new HashMap<>();
        //工序
        map.put("process",flowCardMapper.getProcessNameList());
        //设备下拉框
        map.put("device", reportingWorkMapper.mesSelectWorkBasicDeviceMp());
        //班组下拉框
        map.put("teams", reportingWorkMapper.mesSelectWorkBasicTeamsMp());
        //次破类型
        map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
        //次破原因
        map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
        return map;
    }
}

 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml

@@ -1114,4 +1114,14 @@
        GROUP BY rw.reporting_work_id
        ORDER BY rw.reporting_work_id desc
    </select>

    <select id="mesSelectWorkBasicDeviceMp">
        SELECT bdp.id,bdp.basic_type,bdp.basic_name, bd.basic_name as basic_category FROM  sd.basic_data as bd left join  `basic_data_produce` as bdp
        on bd.id=bdp.basic_category
        where bd.basic_category="process" and bdp.basic_type="device" and bd.basic_name = #{process}
    </select>

    <select id="mesSelectWorkBasicTeamsMp">
        select id,login_name,user_name,address from erp_user_info.`user`
    </select>
</mapper>