diff --git a/src/api/production/schedule.js b/src/api/production/schedule.js
index f42cfce..66735da 100644
--- a/src/api/production/schedule.js
+++ b/src/api/production/schedule.js
@@ -9,4 +9,11 @@ export const getSOScheduleRoutingData=data => createAPI(`schedule/getSOScheduleR
export const cancelJob=data => createAPI(`schedule/cancelJob`, 'post', data);
export const circulationSchedule=data => createAPI(`schedule/circulationSchedule`, 'post', data);
export const closeSchedule=data => createAPI(`schedule/closeSchedule`, 'post', data);
+export const saveGenerateReportForSchedule=data => createAPI(`schedule/saveGenerateReportForSchedule`, 'post', data);
+export const searchReportedQty=data => createAPI(`schedule/searchReportedQty`, 'post', data);
+export const searchSeqNo=data => createAPI(`schedule/searchSeqNo`, 'post', data);
+export const startSeqNo=data => createAPI(`schedule/startSeqNo`, 'post', data);
+export const getSfdcList=data => createAPI(`schedule/getSfdcList`, 'post', data);
+export const cancelSfdc=data => createAPI(`schedule/cancelSfdc`, 'post', data);
+export const getStockPrint=data => createAPI(`schedule/getStockPrint`, 'post', data);
diff --git a/src/views/modules/print/print_seqNo_label.js b/src/views/modules/print/label/print_seqNo_label.js
similarity index 100%
rename from src/views/modules/print/print_seqNo_label.js
rename to src/views/modules/print/label/print_seqNo_label.js
diff --git a/src/views/modules/print/label/print_stock_label_preview.js b/src/views/modules/print/label/print_stock_label_preview.js
new file mode 100644
index 0000000..c3ad158
--- /dev/null
+++ b/src/views/modules/print/label/print_stock_label_preview.js
@@ -0,0 +1,146 @@
+/*调用js打印标签*/
+import getLodop from '@/utils/LodopFuncs.js'
+/*打印材料卷标签*/
+export function printMaterialLabelPreview(printList) {
+ const LODOP = getLodop()
+ if (LODOP) {
+ //LODOP.SET_LICENSES("", "AF8A5800B84BCC5218BCF67B92627BEA", "", "");
+ LODOP.SET_LICENSES("", "AF8A5800B823CC8E18BCF67B925E7BF0", "", "");
+ // LODOP.SET_PRINTER_INDEXA("小标签打印机");
+ //循环调用打印机
+ for(let i = 0; i < printList.length; i++){
+ let printData = printList[i];
+ LODOP.NewPage();
+ LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
+ LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.seqNo);
+ LODOP.ADD_PRINT_TEXT(112,8,133,25,"WareHouse ID:");
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ LODOP.ADD_PRINT_TEXT(112,110,140,25,printData.wareHouseDesc);
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ LODOP.ADD_PRINT_TEXT(154,8,103,24,"Batch No:");
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ LODOP.ADD_PRINT_TEXT(154,110,140,20,printData.batchNo);
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ LODOP.ADD_PRINT_TEXT(133,8,124,25,"Location ID:");
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ LODOP.ADD_PRINT_TEXT(133,110,139,25,printData.locationId);
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ LODOP.ADD_PRINT_TEXT(41,8,132,25,"Part:");
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ LODOP.ADD_PRINT_TEXT(41,56,195,55,printData.partNo+'|'+printData.partDesc);
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ LODOP.ADD_PRINT_TEXT(175,8,82,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(91,8,81,25,"Q.T.Y:");
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ LODOP.ADD_PRINT_TEXT(91,87,138,24,printData.qty+printData.umid);
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ LODOP.ADD_PRINT_TEXT(194,8,113,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(9,140,100,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(176,216,100,20,"Valid Date:");
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ LODOP.ADD_PRINT_TEXT(176,296,100,25,printData.expiredDate);
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ LODOP.ADD_PRINT_TEXT(29,209,189,25,printData.status);
+ LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+ LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+ LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+ if(printData.weight!=''&&printData.weight!=0) {
+ LODOP.ADD_PRINT_TEXT(92,154,100,25,'/'+printData.weight+'KG');
+ LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
+ LODOP.SET_PRINT_STYLEA(0, "Bold", 1);
+ }
+ }
+ // LODOP.PRINT_DESIGN();
+ LODOP.PREVIEW();
+ // LODOP.PRINT();
+ console.log("操作成功!")
+ }
+}
+
+// LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
+// LODOP.ADD_PRINT_BARCODE(11,244,208,140,"QRCode",printData.seqNo);
+// LODOP.ADD_PRINT_TEXT(58,8,108,25,"WareHouseId:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(58,110,140,25,printData.wareHouseId);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(111,8,77,24,"BatchNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(111,110,140,20,printData.batchNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(84,8,98,25,"LocationId:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(84,110,139,25,printData.locationId);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(9,8,72,25,"PartNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(9,110,136,25,printData.partNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(136,8,82,25,"OrderNo:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(136,110,141,25,printData.orderNo);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(34,8,56,25,"Qty:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(34,110,138,24,printData.qty);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(162,8,92,25,"TransDate:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(162,110,170,25,printData.transDate);
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+// LODOP.ADD_PRINT_TEXT(192,5,256,24,"Manufactured by A&M Polymer");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(192,259,109,25,"vender Code:");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(210,5,257,35,"No.188 Taigu Road,Lili lndustrial Park,Wujiang District,Suzhou,China");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_TEXT(246,5,407,35,"Phone: 086-0512-63678826 Email: service@husenrubber.com");
+// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+// LODOP.ADD_PRINT_LINE(186,2,187,374,0,1);
diff --git a/src/views/modules/print/stockPrint.vue b/src/views/modules/print/stockPrint.vue
new file mode 100644
index 0000000..b6f0b0b
--- /dev/null
+++ b/src/views/modules/print/stockPrint.vue
@@ -0,0 +1,245 @@
+
+
+
+
+ 物料编码
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+ 打印标签
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/schedule/cancelSfdc.vue b/src/views/modules/schedule/cancelSfdc.vue
new file mode 100644
index 0000000..7a4888f
--- /dev/null
+++ b/src/views/modules/schedule/cancelSfdc.vue
@@ -0,0 +1,615 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 产品编码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 操作员姓名
+
+
+
+ 机台ID
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ {{ '导出' }}
+
+
+
+
+
+
+ 取消报工
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/schedule/closeSchedule.vue b/src/views/modules/schedule/closeSchedule.vue
index 9c87b0a..b59c118 100644
--- a/src/views/modules/schedule/closeSchedule.vue
+++ b/src/views/modules/schedule/closeSchedule.vue
@@ -98,7 +98,7 @@
label="操作">
关闭派工单
- 派工单已流转
+ 派工单已流转
取消派工单
流转
diff --git a/src/views/modules/schedule/generateReport.vue b/src/views/modules/schedule/generateReport.vue
new file mode 100644
index 0000000..75e8a9e
--- /dev/null
+++ b/src/views/modules/schedule/generateReport.vue
@@ -0,0 +1,791 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 加工中心编码
+
+
+
+ 产品编码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 操作员姓名
+
+
+
+ 机台ID
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ {{'导出'}}
+
+
+
+
+
+ 派工单开始
+ 派工单报工
+
+ {{'导出'}}
+
+
+
+
+
+
+ 报工
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 关闭
+
+
+
+
+
+
+
+
+
+ 开始
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 操作员
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/schedule/searchSfdc.vue b/src/views/modules/schedule/searchSfdc.vue
new file mode 100644
index 0000000..4b7a3c2
--- /dev/null
+++ b/src/views/modules/schedule/searchSfdc.vue
@@ -0,0 +1,579 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 产品编码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 操作员姓名
+
+
+
+ 机台ID
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ {{ '导出' }}
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/schedule/soscheduleRouting.vue b/src/views/modules/schedule/soscheduleRouting.vue
index b863252..cbf2ed6 100644
--- a/src/views/modules/schedule/soscheduleRouting.vue
+++ b/src/views/modules/schedule/soscheduleRouting.vue
@@ -276,7 +276,7 @@
import Chooselist from '@/views/modules/common/Chooselist'
import {
printSeqNoLabel,
- } from "@/views/modules/print/print_seqNo_label.js"
+ } from "@/views/modules/print/label/print_seqNo_label.js"
export default {
name: 'soscheduleRouting',
components: {