diff --git a/src/api/production/generateReport.js b/src/api/production/generateReport.js
index 67284cc..b61b95d 100644
--- a/src/api/production/generateReport.js
+++ b/src/api/production/generateReport.js
@@ -49,3 +49,5 @@ export const getLiuHuaPrintData= data => createAPI(`dailyPlan/getLiuHuaPrintData
export const getTvList=data => createAPI(`dailyPlan/getTvList`, 'post', data)
export const getBadCodeList=data => createAPI(`dailyPlan/getBadCodeList`, 'post', data)
+
+export const printDefectCard=data => createAPI(`dailyPlan/printDefectCard`, 'post', data)
diff --git a/src/views/modules/print/print_transNo_label.js b/src/views/modules/print/print_transNo_label.js
index bcc4cca..8413c35 100644
--- a/src/views/modules/print/print_transNo_label.js
+++ b/src/views/modules/print/print_transNo_label.js
@@ -86,7 +86,84 @@ export function printTransNoLabel(printList) {
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
}
- }else {
+ } else
+ if(printData.type=='bad'){
+ let remark = '';
+ if (printData.partNo.substring(0, 2) == 'FP') {
+ remark = '产成品'
+ } else {
+ remark = '半成品'
+ }
+ LODOP.NewPage();
+ LODOP.SET_PRINT_PAGESIZE(0, 1000, 700, "");
+ LODOP.ADD_PRINT_TEXT(82, 8, 108, 25, "Part:");
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(82, 55, 195, 56, printData.partNo + '|' + printData.partDesc);
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(155, 8, 77, 24, "Job No:");
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(155, 110, 140, 20, printData.seqNo);
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(134, 8, 113, 22, "Equip No:");
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(134, 110, 139, 25, printData.workCenterNo);
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(41,8,118,25, "Confirmed By:");
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(41, 110, 136, 25, printData.userName);
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(175, 8, 94, 25, "Order No:");
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(175, 110, 141, 25, printData.orderNo);
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(61, 8, 121, 25, "Trans Q.T.Y:");
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(61,110,67,24, printData.transQty + printData.umid);
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(194, 8, 97, 25, "Trans Date:");
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(194, 110, 244, 25, printData.transDate);
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(224, 5, 256, 24, "Manufactured by A&M Polymer");
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.ADD_PRINT_TEXT(224, 212, 156, 25, "IATF:16949 Certified");
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Alignment", 3);
+ LODOP.ADD_PRINT_LINE(218, 2, 217, 374, 0, 1);
+ LODOP.ADD_PRINT_TEXT(12, 122, 135, 30, "让步接收单");
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 12);
+ LODOP.SET_PRINT_STYLEA(0, "Alignment", 2);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(194, 266, 110, 25, "工厂编码:" + printData.site);
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 11);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ LODOP.ADD_PRINT_TEXT(174, 267, 100, 21, remark);
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ if(printData.orderRef5!=null) {
+ LODOP.ADD_PRINT_TEXT(61,162,116,25, "净重:" + printData.orderRef5 + "kg");
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ }
+ LODOP.ADD_PRINT_TEXT(41,254,115,133,"不良原因: "+printData.remark);
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ }
+ else {
LODOP.NewPage();
LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
LODOP.ADD_PRINT_TEXT(95,208,173,46,'合格');
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index 2b788f5..ced742d 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -506,12 +506,14 @@
-
-
-
+
+
+
+
+
@@ -674,6 +676,7 @@
reportWeight:'',
approveWeight:'',
moldQty:'',
+ badQty:'',
},
scanSeqNo:'',
previousSeqNo:'',
@@ -830,6 +833,20 @@
})
return
}
+ if (this.saveHeaderData.badCodeNo == 'PQ003' ) {
+ if(this.saveHeaderData.badQty==''||this.saveHeaderData.badQty==null||this.saveHeaderData.badQty<=0){
+ this.$alert('让步接收数量必须大于0！', '错误信息', {
+ confirmButtonText: '确定'
+ })
+ return
+ }
+ if(this.saveHeaderData.badQty>this.saveHeaderData.qtyUnApprove){
+ this.$alert('让步接收数量不能大于不合格数量！', '错误信息', {
+ confirmButtonText: '确定'
+ })
+ return
+ }
+ }
if(this.saveHeaderData.printQty>30){
this.$alert('打印标签数最多为30张！', '错误信息', {
confirmButtonText: '确定'
@@ -862,6 +879,9 @@
if(data.transData!=null){
inList.push(data.transData)
}
+ if(data.badData!=null){
+ inList.push(data.badData)
+ }
if(this.saveHeaderData.printQty>0){
for (let i = 0; i
+
+
+ 让步接收标签
+
+
import {
getSfdcList,
-
+ printDefectCard,
} from '@/api/production/generateReport.js'
import Chooselist from '@/views/modules/common/Chooselist'
-
+ import {
+ printTransNoLabel,
+ } from "@/views/modules/print/print_transNo_label.js"
export default {
name: 'searchSfdc',
@@ -456,11 +469,28 @@
serialNumber: null,
columnType: null,
align: 'left'
+ }, {
+ tableId: "sfdcList",
+ tableName: this.$route.meta.title,
+ columnProp: "defectQty",
+ columnLabel: "处理数量",
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ columnWidth: 85,
+ format: null,
+ functionId: this.$route.meta.menuId,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ serialNumber: null,
+ columnType: null,
+ align: 'left'
}, {
tableId: "sfdcList",
tableName: this.$route.meta.title,
columnProp: "defectRemark",
- columnLabel: "不良处理备注",
+ columnLabel: "不良处理原因",
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -690,7 +720,15 @@
return Y + M + D + H + MM + S;
},
-
+ printCard(row){
+ printDefectCard(row).then(({data}) => {
+ let inList=[];
+ inList.push(data.row)
+ if(inList.length>0){
+ printTransNoLabel(inList);
+ }
+ })
+ }
},
created () {