fengyuan_yang
/
boying-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2025-11-25 

过站采集-》机器下机卷
1、卷号长度给大一些L2025115734-A-2-10-001
2、查询SQL增加where条件：ISNULL(virtualNewRollFlag,'Y') ='N'
3、SQL语句中最后4个字段，放在rollQty后面
master
fengyuan_yang 2 months ago
parent
a75261a9b7
commit
f8379bac7d
1 changed files with 194 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 312
      src/views/modules/yieldReport/com_produce_report_normal.vue

312
src/views/modules/yieldReport/com_produce_report_normal.vue
View File

@ -240,7 +240,7 @@
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="材料" name="sfdc_material">
<el-tab-pane label="材料清单" name="sfdc_material">
<el-table
height="170"
:data="orderBomList"
@ -301,7 +301,11 @@
:width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="!item.columnHidden && item.columnProp !== 'finishedFlagDesc'"> {{ scope.row[item.columnProp] }}</span>
<span v-if="!item.columnHidden && item.columnProp === 'finishedFlagDesc'"
:style="{color: scope.row.finishedFlagDesc === '是' ? '#67C23A' : '#F56C6C', fontWeight: 'bold'}">
{{ scope.row.finishedFlagDesc }}
</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
@ -1222,7 +1226,7 @@ export default {
columnProp: "umid",
headerAlign: "center",
align: "center",
columnLabel: "计量单位",
columnLabel: "单位",
columnWidth: 65,
columnHidden: false,
columnImage: false,
@ -1640,7 +1644,7 @@ export default {
columnProp: "partUm",
headerAlign: "center",
align: "center",
columnLabel: "计量单位",
columnLabel: "单位",
columnWidth: 60,
columnHidden: false,
columnImage: false,
@ -1721,6 +1725,42 @@ export default {
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303BomQtyReturn',
tableId: "5303Bom",
tableName: "工单bom",
columnProp: "qtyReturn",
headerAlign: "center",
align: "right",
columnLabel: "退料数量",
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303BomTheoryQtyReturn',
tableId: "5303Bom",
tableName: "工单bom",
columnProp: "theoryQtyReturn",
headerAlign: "center",
align: "right",
columnLabel: "理论应退数量",
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
@ -1813,24 +1853,6 @@ export default {
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialReportDate',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "reportDate",
headerAlign: "center",
align: "center",
columnLabel: "报告时间",
columnWidth: 125,
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
@ -1870,32 +1892,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialRmRollNo',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "rmRollNo",
headerAlign: "center",
align: "center",
columnLabel: "材料卷号",
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialPartNo',
serialNumber: '5303MaterialTransQty',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "partNo",
columnProp: "transQty",
headerAlign: "center",
align: "center",
columnLabel: "零部件编码",
columnWidth: 100,
align: "right",
columnLabel: "数量",
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -1906,17 +1910,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialRemark',
serialNumber: '5303MaterialNetIssueQty',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "remark",
columnProp: "netIssueQty",
headerAlign: "center",
align: "center",
columnLabel: "备注",
align: "right",
columnLabel: "净耗用数量",
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1924,14 +1928,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialStartDate',
serialNumber: '5303MaterialRmRollNo',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "startDate",
columnProp: "rmRollNo",
headerAlign: "center",
align: "center",
columnLabel: "开始使用时间",
columnWidth: 125,
align: "left",
columnLabel: "材料卷号",
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -1942,14 +1946,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialFinishedDate',
serialNumber: '5303MaterialPartNo',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "finishedDate",
columnProp: "partNo",
headerAlign: "center",
align: "center",
columnLabel: "结束使用时间",
columnWidth: 125,
align: "left",
columnLabel: "零部件编码",
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -1960,17 +1964,17 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialFinishedFlag',
serialNumber: '5303MaterialPartDesc',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "finishedFlag",
columnProp: "partDesc",
headerAlign: "center",
align: "center",
columnLabel: "结束使用",
columnWidth: 60,
align: "left",
columnLabel: "零部件名称",
columnWidth: 200,
columnHidden: false,
columnImage: false,
columnSortable: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
@ -1978,14 +1982,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialHistType',
serialNumber: '5303MaterialSpec',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "histType",
columnProp: "spec",
headerAlign: "center",
align: "center",
columnLabel: "类型",
columnWidth: 80,
align: "left",
columnLabel: "规格型号",
columnWidth: 120,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -1996,14 +2000,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialTransGeneratedFlag',
serialNumber: '5303MaterialStartDate',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "transGeneratedFlag",
columnProp: "startDate",
headerAlign: "center",
align: "center",
columnLabel: "是否同步SAp",
columnWidth: 80,
columnLabel: "开始使用时间",
columnWidth: 125,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -2014,14 +2018,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialOriginalRMRollNo',
serialNumber: '5303MaterialFinishedDate',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "originalRMRollNo",
columnProp: "finishedDate",
headerAlign: "center",
align: "center",
columnLabel: "原材料卷号",
columnWidth: 80,
columnLabel: "结束使用时间",
columnWidth: 125,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -2032,14 +2036,14 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialUnissueFlag',
serialNumber: '5303MaterialFinishedFlagDesc',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "unissueFlag",
columnProp: "finishedFlagDesc",
headerAlign: "center",
align: "center",
columnLabel: "是否退料",
columnWidth: 80,
columnLabel: "是否结束",
columnWidth: 60,
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -2050,13 +2054,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialTransQty',
serialNumber: '5303MaterialHistType',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "transQty",
columnProp: "histType",
headerAlign: "center",
align: "center",
columnLabel: "数量",
columnLabel: "类型",
columnWidth: 80,
columnHidden: false,
columnImage: false,
@ -2068,13 +2072,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialNetIssueQty',
serialNumber: '5303MaterialOriginalRMRollNo',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "netIssueQty",
columnProp: "originalRMRollNo",
headerAlign: "center",
align: "center",
columnLabel: "净耗用数量",
align: "left",
columnLabel: "原材料卷号",
columnWidth: 80,
columnHidden: false,
columnImage: false,
@ -2086,13 +2090,13 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialOriginalHistSeqNo',
serialNumber: '5303MaterialUnissueFlagDesc',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "originalHistSeqNo",
columnProp: "unissueFlagDesc",
headerAlign: "center",
align: "center",
columnLabel: "关联序号",
columnLabel: "是否退料",
columnWidth: 80,
columnHidden: false,
columnImage: false,
@ -2104,10 +2108,10 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialKeyRMFlag',
serialNumber: '5303MaterialKeyRMFlagDesc',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "keyRMFlag",
columnProp: "keyRMFlagDesc",
headerAlign: "center",
align: "center",
columnLabel: "是否主材",
@ -2127,7 +2131,7 @@ export default {
tableName: "派工单材料",
columnProp: "startFromRollNo",
headerAlign: "center",
align: "center",
align: "left",
columnLabel: "上机时的半成品卷号",
columnWidth: 115,
columnHidden: false,
@ -2146,7 +2150,7 @@ export default {
columnProp: "sAPBOMItemNo",
headerAlign: "center",
align: "center",
columnLabel: "SAP BOM序号",
columnLabel: "BOM序号",
columnWidth: 100,
columnHidden: false,
columnImage: false,
@ -2158,10 +2162,10 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialSetupflag',
serialNumber: '5303MaterialSetupflagDesc',
tableId: "5303Material",
tableName: "派工单材料",
columnProp: "setupflag",
columnProp: "setupFlagDesc",
headerAlign: "center",
align: "center",
columnLabel: "调机",
@ -2799,9 +2803,9 @@ export default {
tableName: "下机卷",
columnProp: "rollNo",
headerAlign: "center",
align: "center",
align: "left",
columnLabel: "卷号",
columnWidth: 100,
columnWidth: 180,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -2819,7 +2823,7 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "创建时间",
columnWidth: 125,
columnWidth: 130,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -2835,7 +2839,7 @@ export default {
tableName: "下机卷",
columnProp: "createdBy",
headerAlign: "center",
align: "center",
align: "left",
columnLabel: "创建人",
columnWidth: 90,
columnHidden: false,
@ -2855,7 +2859,7 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "当前生产工序号",
columnWidth: 95,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -2873,7 +2877,7 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "最近完工工序号",
columnWidth: 95,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -2891,7 +2895,7 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "完工时间",
columnWidth: 125,
columnWidth: 130,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -2909,7 +2913,7 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "是否完成",
columnWidth: 100,
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -2927,7 +2931,7 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "是否在线",
columnWidth: 100,
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -2945,7 +2949,7 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "暂停",
columnWidth: 35,
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -2961,9 +2965,9 @@ export default {
tableName: "下机卷",
columnProp: "oriRollNo",
headerAlign: "center",
align: "center",
align: "left",
columnLabel: "原卷号",
columnWidth: 100,
columnWidth: 180,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -2981,7 +2985,7 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "开始生产工序号",
columnWidth: 95,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -2999,7 +3003,7 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "卷类型",
columnWidth: 75,
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -3017,7 +3021,7 @@ export default {
headerAlign: "center",
align: "center",
columnLabel: "创建卷的工序号",
columnWidth: 95,
columnWidth: 100,
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -3033,9 +3037,81 @@ export default {
tableName: "下机卷",
columnProp: "rollQty",
headerAlign: "center",
align: "center",
align: "right",
columnLabel: "卷数量",
columnWidth: 55,
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollGoodQty',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "goodQty",
headerAlign: "center",
align: "right",
columnLabel: "良品数",
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollDefectQty',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "defectQty",
headerAlign: "center",
align: "right",
columnLabel: "不良数",
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollYieldRate',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "yieldRate",
headerAlign: "center",
align: "right",
columnLabel: "良率",
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollTotalQty',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "totalQty",
headerAlign: "center",
align: "right",
columnLabel: "总数",
columnWidth: 80,
columnHidden: false,
columnImage: false,
columnSortable: true,
@ -3051,9 +3127,9 @@ export default {
tableName: "下机卷",
columnProp: "firstLevelRollNo",
headerAlign: "center",
align: "center",
align: "left",
columnLabel: "最原始卷号",
columnWidth: 100,
columnWidth: 180,
columnHidden: false,
columnImage: false,
columnSortable: true,

Write Preview
Loading…
Cancel
Save