diff --git a/src/App.vue b/src/App.vue
index d1b6c03..5494da7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,7 +11,7 @@
data() {
return {
query: {},
- version: '1.2.3'
+ version: '1.2.4'
}
},
created() {
diff --git a/src/api/yieldReport/com_finish_roll.js b/src/api/yieldReport/com_finish_roll.js
index d80d020..a65891e 100644
--- a/src/api/yieldReport/com_finish_roll.js
+++ b/src/api/yieldReport/com_finish_roll.js
@@ -51,3 +51,5 @@ export const repackFinishRollWithNoFqc = data => createAPI(`schedule/repackFinis
// 分切订单获取报工数量的请求
export const getSplitOrderCurrentRollReportedQty = data => createAPI('schedule/getSplitOrderCurrentRollReportedQty','POST',data)
+//查询打印的数据
+export const getSfdcFlowLabelData = data => createAPI('scheduling/getSfdcFlowLabelData', 'POST', data)
diff --git a/src/api/yieldReport/com_merge_roll.js b/src/api/yieldReport/com_merge_roll.js
index 7dd4d94..8473ba0 100644
--- a/src/api/yieldReport/com_merge_roll.js
+++ b/src/api/yieldReport/com_merge_roll.js
@@ -8,3 +8,6 @@ export const checkMergeSfdcRoll = data => createAPI('schedule/checkMergeSfdcRoll
// 执行合并卷的操作
export const processMergeSfdcRoll = data => createAPI('schedule/processMergeSfdcRoll', 'POST', data)
+
+//查询打印的数据
+export const getSfdcFlowLabelData = data => createAPI('scheduling/getSfdcFlowLabelData', 'POST', data)
diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js
index 2ab5f86..6b1cafb 100644
--- a/src/api/yieldReport/produce_report_normal.js
+++ b/src/api/yieldReport/produce_report_normal.js
@@ -81,12 +81,5 @@ export const switchrollReverse = data => createAPI('schedule/switchrollReverse',
//查询班次数据
export const getScheduleShiftData = data => createAPI('schedule/getScheduleShiftData', 'POST', data)
-
-
-
-
-
-
-
-
-
+//查询打印的数据
+export const getSfdcFlowLabelData = data => createAPI('scheduling/getSfdcFlowLabelData', 'POST', data)
diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index 7dc5150..97d129c 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -252,8 +252,15 @@ import {
getSfdcMaterialByRollNo,
checkFinishRollWithNoFqc,
finishRollWithNoFqc,
- getSORoutingPreviousOperationItemNo
+ getSORoutingPreviousOperationItemNo,
+ getSfdcFlowLabelData,/*执行打印的请求*/
} from '@/api/yieldReport/com_finish_roll.js';
+
+ /*打印标签专用的js*/
+ import {
+ printSfdcLabel,
+ } from "@/views/modules/yieldReport/print_roll_label.js";
+
export default {
name: "com_finish_roll",
data() {
@@ -848,8 +855,20 @@ export default {
if(data.code == 500){
this.$message.error(data.msg);
}else{
- //关闭当前的页面
- this.closeDialog();
+ //判断是否打印卷标签
+ if(data.rollNo != ''){
+ //需要打印标签
+ let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
+ rollNo: data.rollNo};
+ this.printSfdcFlowLabel(printRow);
+ //延时一秒关闭 --预防没有出标签
+ setTimeout(() => {
+ this.closeDialog();
+ }, 1000);
+ }else{
+ //关闭当前的页面
+ this.closeDialog();
+ }
}
})
},
@@ -894,6 +913,20 @@ export default {
this.pageData.remark = username+"更改了班次."
},
+ /*打印流转标签*/
+ printSfdcFlowLabel(sfdcRow){
+ //先查询打印的卷信息
+ getSfdcFlowLabelData(sfdcRow).then(({data}) => {
+ //开始打印标签
+ if(data.code === 200){
+ let printList = data.printList;
+ printSfdcLabel(printList);
+ }else{
+ this.$message.error(data.msg);
+ }
+ });
+ },
+
},
created() {
// this.factoryList()
diff --git a/src/views/modules/yieldReport/com_merge_roll.vue b/src/views/modules/yieldReport/com_merge_roll.vue
index e1ee40d..6dd802a 100644
--- a/src/views/modules/yieldReport/com_merge_roll.vue
+++ b/src/views/modules/yieldReport/com_merge_roll.vue
@@ -53,7 +53,14 @@
getMergeRollPageData,
checkMergeSfdcRoll,/*校验是否合并卷*/
processMergeSfdcRoll,/*执行合并卷的操作*/
+ getSfdcFlowLabelData,/*执行打印的请求*/
} from "@/api/yieldReport/com_merge_roll.js";
+
+ /*打印标签专用的js*/
+ import {
+ printSfdcLabel,
+ } from "@/views/modules/yieldReport/print_roll_label.js";
+
export default {
data() {
return {
@@ -259,7 +266,14 @@ export default {
this.$message.error(data.msg);
} else {
this.$message.success(data.msg);
- this.closeDialog();
+ //先打印再继续关闭
+ let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
+ rollNo: data.rollNo};
+ this.printSfdcFlowLabel(printRow);
+ //延时一秒关闭 --预防没有出标签
+ setTimeout(() => {
+ this.closeDialog();
+ }, 1000);
}
});
});
@@ -270,7 +284,14 @@ export default {
this.$message.error(data.msg);
} else {
this.$message.success(data.msg);
- this.closeDialog();
+ //先打印再继续关闭
+ let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
+ rollNo: data.rollNo};
+ this.printSfdcFlowLabel(printRow);
+ //延时一秒关闭 --预防没有出标签
+ setTimeout(() => {
+ this.closeDialog();
+ }, 1000);
}
});
}
@@ -296,7 +317,14 @@ export default {
this.$message.error(data.msg);
} else {
this.$message.success(data.msg);
- this.closeDialog();
+ //先打印再继续关闭
+ let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
+ rollNo: data.rollNo};
+ this.printSfdcFlowLabel(printRow);
+ //延时一秒关闭 --预防没有出标签
+ setTimeout(() => {
+ this.closeDialog();
+ }, 1000);
}
});
});
@@ -307,7 +335,14 @@ export default {
this.$message.error(data.msg);
} else {
this.$message.success(data.msg);
- this.closeDialog();
+ //先打印再继续关闭
+ let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
+ rollNo: data.rollNo};
+ this.printSfdcFlowLabel(printRow);
+ //延时一秒关闭 --预防没有出标签
+ setTimeout(() => {
+ this.closeDialog();
+ }, 1000);
}
});
}
@@ -316,6 +351,20 @@ export default {
});
},
+ /*打印流转标签*/
+ printSfdcFlowLabel(sfdcRow){
+ //先查询打印的卷信息
+ getSfdcFlowLabelData(sfdcRow).then(({data}) => {
+ //开始打印标签
+ if(data.code === 200){
+ let printList = data.printList;
+ printSfdcLabel(printList);
+ }else{
+ this.$message.error(data.msg);
+ }
+ });
+ },
+
},
created() {
// this.factoryList()
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 3fefd42..5a88888 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -1,3 +1,4 @@
+
删除卷
+ 删除卷
+ 打印卷标签
+ (printList);
@@ -606,7 +614,14 @@ import {
processFinishTool,/*执行工具的结束使用的方法*/
finishMaterialWithNoRemainder,/*执行材料结束使用 且无剩余 */
switchrollReverse,
+ getSfdcFlowLabelData,
} from "@/api/yieldReport/produce_report_normal.js";
+
+/*打印标签专用的js*/
+import {
+ printSfdcLabel,
+} from "@/views/modules/yieldReport/print_roll_label.js"
+
/*引入组件*/
import comSwitchOperator from "./com_switch_operator";/*切换操作员*/
import comSwitchRoll from "./com_switch_roll";/*切换卷操作*/
@@ -626,7 +641,6 @@ import comProduceDown from "./com_produce_down";/*停机组件*/
import comFinishSchedule from "./com_finish_schedule";/*结束派工单组件*/
import notOverFinishRoll from "./not_over_finish_roll";/*生产过程的停机组件*/
export default {
- name: "com_produce_report_normal",
data() {
return {
titleCon: '',
@@ -3646,6 +3660,21 @@ export default {
});
},
+ /*打印流转标签*/
+ printSfdcFlowLabel(sfdcRow){
+ //先查询打印的卷信息
+ getSfdcFlowLabelData(sfdcRow).then(({data}) => {
+ //开始打印标签
+ if(data.code === 200){
+ let printList = data.printList;
+ printSfdcLabel(printList);
+ }else{
+ this.$message.error(data.msg);
+ }
+ });
+ },
+
+
},
created() {
// this.factoryList()
diff --git a/src/views/modules/yieldReport/com_separate_roll.vue b/src/views/modules/yieldReport/com_separate_roll.vue
index 01c4f43..6bf8b69 100644
--- a/src/views/modules/yieldReport/com_separate_roll.vue
+++ b/src/views/modules/yieldReport/com_separate_roll.vue
@@ -55,7 +55,13 @@
import {
checkCreateSplitSfdcRoll,/*校验是否可以创建分卷*/
createSplitSfdcRoll,/*执行创建分卷的操作*/
- } from '@/api/yieldReport/com_separate_roll.js'
+ } from '@/api/yieldReport/com_separate_roll.js';
+
+ /*打印标签专用的js*/
+ import {
+ printSfdcLabel,
+ } from "@/views/modules/yieldReport/print_roll_label.js";
+
export default {
name: "com_separate_roll",
data() {
@@ -217,8 +223,14 @@ export default {
if (data.code == 500) {
this.$message.error(data.msg);
} else {
- //关闭当前的页面
- this.closeDialog();
+ //处理打印的数据
+ let printList = data.printList;
+ printSfdcLabel(printList);
+ //延时关闭弹窗
+ setTimeout(() =>{
+ //关闭当前的页面
+ this.closeDialog();
+ }, 1000)
}
})
},
diff --git a/src/views/modules/yieldReport/not_over_finish_roll.vue b/src/views/modules/yieldReport/not_over_finish_roll.vue
index f808930..7d77809 100644
--- a/src/views/modules/yieldReport/not_over_finish_roll.vue
+++ b/src/views/modules/yieldReport/not_over_finish_roll.vue
@@ -290,8 +290,14 @@ import {
} from '@/api/yieldReport/com_finish_roll.js';
import {
getScheduleDateShift,
+ getSfdcFlowLabelData,/*执行打印的请求*/
} from "@/api/yieldReport/produce_report_normal.js";
+/*打印标签专用的js*/
+import {
+ printSfdcLabel,
+} from "@/views/modules/yieldReport/print_roll_label.js";
+
export default {
data() {
return {
@@ -903,8 +909,20 @@ export default {
if (data.code == 500) {
this.$message.error(data.msg);
} else {
- //关闭当前的页面
- this.closeDialog();
+ //判断是否打印卷标签
+ if(data.rollNo != ''){
+ //需要打印标签
+ let printRow = {site: this.pageData.site, orderNo: this.pageData.orderNo,
+ rollNo: data.rollNo};
+ this.printSfdcFlowLabel(printRow);
+ //延时一秒关闭 --预防没有出标签
+ setTimeout(() => {
+ this.closeDialog();
+ }, 1000);
+ }else{
+ //关闭当前的页面
+ this.closeDialog();
+ }
}
})
},
@@ -948,6 +966,20 @@ export default {
this.pageData.remark = username + "更改了班次."
},
+ /*打印流转标签*/
+ printSfdcFlowLabel(sfdcRow){
+ //先查询打印的卷信息
+ getSfdcFlowLabelData(sfdcRow).then(({data}) => {
+ //开始打印标签
+ if(data.code === 200){
+ let printList = data.printList;
+ printSfdcLabel(printList);
+ }else{
+ this.$message.error(data.msg);
+ }
+ });
+ },
+
},
created() {
// this.factoryList()
diff --git a/src/views/modules/yieldReport/print_roll_label.js b/src/views/modules/yieldReport/print_roll_label.js
index 3b6e2a8..5fab4cf 100644
--- a/src/views/modules/yieldReport/print_roll_label.js
+++ b/src/views/modules/yieldReport/print_roll_label.js
@@ -58,10 +58,84 @@ export function printMaterialLabel(printList) {
LODOP.ADD_PRINT_TEXT(189,120,90,17, printData.createdBy);
}
//LODOP.PRINT_DESIGN();
+ //LODOP.PREVIEW();
+ LODOP.PRINT();
+
+ console.log("原材料标签打印成功! 数量为: "+printList.length+"张。")
+ }
+}
+
+/*打印流程标签*/
+export function printSfdcLabel(printList) {
+ const LODOP = getLodop()
+ if (LODOP) {
+ //LODOP.SET_LICENSES("", "13F0BE83846277CB60918577C6281375", "", "");
+ LODOP.SET_LICENSES("", "7B5624CC84E599D6B17F27DF40F4310C", "", "");
+ //循环调用打印机
+ for(let i = 0; i < printList.length; i++){
+ let printData = printList[i];
+ LODOP.NewPage();
+ LODOP.SET_PRINT_PAGESIZE(0,700,600,"");
+ LODOP.ADD_PRINT_LINE(5,5,6,254,0,1);
+ LODOP.ADD_PRINT_LINE(25,5,26,254,0,1);
+ LODOP.ADD_PRINT_LINE(40,5,41,254,0,1);
+ LODOP.ADD_PRINT_LINE(55,5,56,254,0,1);
+ LODOP.ADD_PRINT_LINE(90,5,91,254,0,1);
+ LODOP.ADD_PRINT_LINE(105,5,106,254,0,1);
+ LODOP.ADD_PRINT_LINE(120,5,121,254,0,1);
+ LODOP.ADD_PRINT_LINE(135,5,136,254,0,1);
+ LODOP.ADD_PRINT_LINE(150,5,151,185,0,1);
+ LODOP.ADD_PRINT_LINE(173,5,174,185,0,1);
+ LODOP.ADD_PRINT_LINE(189,5,188,185,0,1);
+ LODOP.ADD_PRINT_LINE(203,5,204,254,0,1);
+ LODOP.ADD_PRINT_LINE(203,5,5,6,0,1);
+ LODOP.ADD_PRINT_LINE(203,254,5,255,0,1);
+ LODOP.ADD_PRINT_LINE(173,65,25,66,0,1);
+ LODOP.ADD_PRINT_LINE(203,186,136,187,0,1);
+ //区分判断 显示不同的表
+ if (printData.nextItemDesc === '仓库'){
+ LODOP.ADD_PRINT_TEXT(7,96,90,15,"物料明细表");
+ }else{
+ LODOP.ADD_PRINT_TEXT(7,97,90,15,"流程标签");
+ }
+ LODOP.SET_PRINT_STYLEA(0,"FontName","黑体");
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+ LODOP.ADD_PRINT_TEXT(27,7,60,15,"卷号");
+ LODOP.ADD_PRINT_TEXT(42,7,60,15,"料号");
+ LODOP.ADD_PRINT_TEXT(65,8,70,25,"品名规格");
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.ADD_PRINT_TEXT(92,5,60,17,"客户料号");
+ LODOP.ADD_PRINT_TEXT(107,7,60,15,"客户名称");
+ LODOP.ADD_PRINT_TEXT(123,7,60,17,"创建人/日期");
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
+ LODOP.ADD_PRINT_TEXT(137,7,60,15,"数量");
+ LODOP.ADD_PRINT_TEXT(154,7,65,15,"工序/下道");
+ LODOP.ADD_PRINT_TEXT(27,120,100,15, printData.rollNo);
+ LODOP.ADD_PRINT_TEXT(42,115,100,15, printData.partNo);
+ LODOP.ADD_PRINT_TEXT(55,70,185,35, printData.partDesc);
+ LODOP.ADD_PRINT_TEXT(92,70,185,15, printData.customerPartNo);
+ LODOP.ADD_PRINT_TEXT(107,70,180,15, printData.customerName);
+ LODOP.ADD_PRINT_TEXT(122,70,45,15, printData.createdBy);
+ LODOP.ADD_PRINT_TEXT(122,135,120,15, printData.createdDate);
+ LODOP.ADD_PRINT_TEXT(137,79,50,15, printData.rollQty);
+ LODOP.ADD_PRINT_TEXT(150,70,55,20, printData.itemDesc);
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+ LODOP.ADD_PRINT_TEXT(157,140,50,20, printData.nextItemDesc);
+ LODOP.ADD_PRINT_BARCODE(138,188,100,75,"QRCode", printData.rollNo);
+ LODOP.ADD_PRINT_TEXT(204,8,100,20,"融新标签");
+ if (printData.customerName === '伊连特' && printData.customerName != ''){
+ LODOP.ADD_PRINT_IMAGE(173,10,23,15.5, "
");
+ LODOP.SET_PRINT_STYLEA(0, "Stretch", 1);//(不变形)原比例扩展缩放模式
+ //设置
+ LODOP.ADD_PRINT_TEXT(175,50, 100,20, printData.ul);
+ LODOP.ADD_PRINT_TEXT(190,7, 120, 15, "Factory ID: YR");
+ }
+ }
+ //LODOP.PRINT_DESIGN();
LODOP.PREVIEW();
//LODOP.PRINT();
- console.log("操作成功！")
+ console.log("流转标签打印成功!数量："+printList.length+"张。");
}
}
diff --git a/static/img/sfdc_ul.jpg b/static/img/sfdc_ul.jpg
new file mode 100644
index 0000000..ccb7a2b
Binary files /dev/null and b/static/img/sfdc_ul.jpg differ