diff --git a/src/views/modules/print/print_outBox_label.js b/src/views/modules/print/print_outBox_label.js index 674fcc2..16e69d5 100644 --- a/src/views/modules/print/print_outBox_label.js +++ b/src/views/modules/print/print_outBox_label.js @@ -81,21 +81,22 @@ export function printOutBoxLabel(printList) { LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(201,9,121,25,"Batch Number"); + LODOP.ADD_PRINT_TEXT(307,16,44,25,"P/N"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(307,17,42,25,"P/N"); + LODOP.ADD_PRINT_TEXT(191,83,44,40,"P/ONo."); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",12); + LODOP.SET_PRINT_STYLEA(0,"Alignment",3); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(307,237,58,25,"Q.T.Y"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",13); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(307,388,47,26,"P/O"); + LODOP.ADD_PRINT_TEXT(307,369,82,26,"Batch No"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); - LODOP.SET_PRINT_STYLEA(0,"FontSize",12); + LODOP.SET_PRINT_STYLEA(0,"FontSize",11); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(69,63,149,25,printData.partSpec); @@ -141,24 +142,26 @@ export function printOutBoxLabel(printList) { LODOP.SET_PRINT_STYLEA(0,"Bold",1); if(printData.iconInfo!=''&&printData.iconInfo!=null) { // LODOP.ADD_PRINT_IMAGE(185,425,99,50, ""); - LODOP.ADD_PRINT_IMAGE(185,425,99,50, ""); + LODOP.ADD_PRINT_IMAGE(188,9,77,46, ""); LODOP.SET_PRINT_STYLEA(0,"Stretch",2); } if(printData.code=='CODE128') { - LODOP.ADD_PRINT_BARCODE(189,146,224,46,"128A",printData.batchNo); + LODOP.ADD_PRINT_BARCODE(189,146,224,46,"128A",printData.customerPONo); + LODOP.ADD_PRINT_BARCODE(189,373,180,46,"128A",printData.contractNo); LODOP.ADD_PRINT_BARCODE(248,13,214,46,"128A",printData.partSpec); LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); LODOP.ADD_PRINT_BARCODE(248,240,120,46,"128A",printData.unitQty); LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); - LODOP.ADD_PRINT_BARCODE(248,376,169,46,"128A",printData.customerPONo); + LODOP.ADD_PRINT_BARCODE(248,372,179,46,"128A",printData.batchNo); LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); }else { - LODOP.ADD_PRINT_BARCODE(189,146,219,46,"Code39",printData.batchNo); + LODOP.ADD_PRINT_BARCODE(189,146,219,46,"Code39",printData.customerPONo); + LODOP.ADD_PRINT_BARCODE(189,373,180,46,"Code39",printData.contractNo); LODOP.ADD_PRINT_BARCODE(248,13,214,46,"Code39",printData.partSpec); LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); LODOP.ADD_PRINT_BARCODE(248,240,120,46,"Code39",printData.unitQty); LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); - LODOP.ADD_PRINT_BARCODE(248,376,169,46,"Code39",printData.customerPONo); + LODOP.ADD_PRINT_BARCODE(248,372,179,46,"Code39",printData.batchNo); LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); } LODOP.ADD_PRINT_TEXT(307,64,170,25,printData.partSpec); @@ -169,7 +172,7 @@ export function printOutBoxLabel(printList) { LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(308,437,121,25,printData.customerPONo); + LODOP.ADD_PRINT_TEXT(308,439,121,25,printData.batchNo); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontSize",11); LODOP.SET_PRINT_STYLEA(0,"Bold",1); @@ -190,6 +193,7 @@ export function printOutBoxLabel(printList) { LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"Alignment",2); LODOP.SET_PRINT_STYLEA(0,"Bold",1); + LODOP.ADD_PRINT_LINE(240,88,180,89,0,1); // LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90); } diff --git a/src/views/modules/production/cancelSfdc.vue b/src/views/modules/production/cancelSfdc.vue index 1e06321..e39445d 100644 --- a/src/views/modules/production/cancelSfdc.vue +++ b/src/views/modules/production/cancelSfdc.vue @@ -14,8 +14,8 @@ 产品编码 - - + + @@ -564,7 +564,7 @@ workCenterNo: '', partNo: '', site: this.$store.state.user.site, - itemNo:'', + partDesc:'', startDate:new Date(), endDate:'', operatorName:'', diff --git a/src/views/modules/production/closeSchedule.vue b/src/views/modules/production/closeSchedule.vue index a9f4689..2e3eee2 100644 --- a/src/views/modules/production/closeSchedule.vue +++ b/src/views/modules/production/closeSchedule.vue @@ -18,8 +18,8 @@ 产品编码 - - + + @@ -452,7 +452,7 @@ sWorkCenterNo: '', partNo: '', site: '', - itemDesc:'', + partDesc:'', scheduleType:'', reportFlag:'QtyRequired>QtyReported', startDate:'', diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue index 6594dc3..f3b00ff 100644 --- a/src/views/modules/production/dailyPlan.vue +++ b/src/views/modules/production/dailyPlan.vue @@ -83,6 +83,9 @@ 物料编码 + + + @@ -403,6 +406,7 @@ schedulingFlag: false, tableData: [], searchData: { + partDescription:'', orderNo: '', startDate1: new Date(), endDate1: '', diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue index 603209a..139eb51 100644 --- a/src/views/modules/production/generateReport.vue +++ b/src/views/modules/production/generateReport.vue @@ -18,8 +18,8 @@ 产品编码 - - + + @@ -694,7 +694,7 @@ sWorkCenterNo: '', partNo: '', site: '', - itemDesc:'', + partDesc:'', scheduleType:'', reportFlag:"closedFlag='N'", startDate:'', diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue index 79455ec..e9b87e4 100644 --- a/src/views/modules/production/scheduleForSOTask.vue +++ b/src/views/modules/production/scheduleForSOTask.vue @@ -11,8 +11,8 @@ - - + + isnull(SL.scheduledQty,0)', - itemNo:'', + partDescription:'', finishFlag:'', userId:this.$store.state.user.name, }, diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue index fe675b6..a3563d3 100644 --- a/src/views/modules/production/scheduleForShopOrder.vue +++ b/src/views/modules/production/scheduleForShopOrder.vue @@ -50,8 +50,8 @@ placeholder="选择日期"> - - + + @@ -578,7 +578,7 @@ endDate4: '', site: '', planStatus: 'ROUND(a.LotSize,3) >ROUND(ISNULL(SL.scheduledQty,0),3)', - itemNo:'', + partDescription:'', userId:this.$store.state.user.name, }, weightFactorFlag:false, diff --git a/src/views/modules/production/searchSfdc.vue b/src/views/modules/production/searchSfdc.vue index 7f6e9fc..2b048e8 100644 --- a/src/views/modules/production/searchSfdc.vue +++ b/src/views/modules/production/searchSfdc.vue @@ -14,8 +14,8 @@ 产品编码 - - + + @@ -552,7 +552,7 @@ workCenterNo: '', partNo: '', site: this.$store.state.user.site, - itemNo:'', + partDesc:'', startDate:new Date(), endDate:'', operatorName:'', diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue index 30fc35f..7774f3a 100644 --- a/src/views/modules/production/soscheduleRouting.vue +++ b/src/views/modules/production/soscheduleRouting.vue @@ -18,8 +18,8 @@ 产品编码 - - + + @@ -413,7 +413,7 @@ seqNo:'', partNo: '', site: '', - itemDesc:'', + partDesc:'', scheduleType:'', reportFlag:'QtyRequired>QtyApprove', startDate:'',