wilson
/
ha-mes-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

0412 新看板

master
ruanqi 3 years ago
parent
92e09d12e8
commit
4e4d9761c6
6 changed files with 168 additions and 56 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. 6
      src/api/production/generateReport.js
  2. 172
      src/views/modules/production/generateReport.vue
  3. 11
      src/views/modules/production/print_seqNo_label.js
  4. 18
      src/views/modules/production/print_stock_label.js
  5. 15
      src/views/modules/production/print_transNo_label.js
  6. 2
      src/views/modules/production/stockPrint.vue

6
src/api/production/generateReport.js
View File

@ -23,7 +23,11 @@ export const updatePrintStock= data => createAPI(`dailyPlan/updatePrintStock`, '
export const searchSeqNo= data => createAPI(`dailyPlan/searchSeqNo`, 'post', data);
//保存开始时间
export const startSeqNo= data => createAPI(`dailyPlan/startSeqNo`, 'post', data);
//保存开始时间
export const stopWork= data => createAPI(`dailyPlan/stopWork`, 'post', data);
export const continueWork= data => createAPI(`dailyPlan/continueWork`, 'post', data);
export const circulationSchedule= data => createAPI(`dailyPlan/circulationSchedule`, 'post', data);
export const closeSchedule= data => createAPI(`dailyPlan/closeSchedule`, 'post', data);

172
src/views/modules/production/generateReport.vue
View File

@ -30,43 +30,64 @@
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item :label="'派工日期：'">
<el-date-picker
style="width: 130px"
v-model="searchData.startDate"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'至: '">
<el-date-picker
style="width: 130px"
v-model="searchData.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(26,3)"><a herf="#">操作员姓名</a></span>
<el-input v-model="searchData.operatorName" style="width: 120px"></el-input>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台ID</a></span>
<el-input v-model="searchData.sResourceID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'班次'">
<el-select v-model="searchData.sShiftNo" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="白班" value="白班"></el-option>
<el-option label="晚班" value="晚班"></el-option>
</el-select>
</el-form-item>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item :label="'派工日期：'">
<el-date-picker
style="width: 130px"
v-model="searchData.startDate"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'至: '">
<el-date-picker
style="width: 130px"
v-model="searchData.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(26,3)"><a herf="#">操作员姓名</a></span>
<el-input v-model="searchData.operatorName" style="width: 120px"></el-input>
</el-form-item>
<el-form-item >
<span slot="label" style="" @click="getBaseList(88)"><a herf="#">机台ID</a></span>
<el-input v-model="searchData.sResourceID" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'班次'">
<el-select v-model="searchData.sShiftNo" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="白班" value="白班"></el-option>
<el-option label="晚班" value="晚班"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
<el-button @click="search()" style="margin-left: 0px;margin-top:0px" type="primary">查询</el-button>
<download-excel
:fields="exportDataStandard"
:data="tableData"
type="xlsx"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:defaultValue="exportDefaultValue"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{'导出'}}
</download-excel>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item :label="' '">
<el-button @click="openStart()" style="margin-left: 0px;margin-top:0px" type="primary">派工单开始</el-button>
<el-button @click="openScan()" style="margin-left: 0px;margin-top:0px" type="primary">派工单报工</el-button>
<el-button @click="stopScan()" style="margin-left: 0px;margin-top:0px" type="primary">派工单暂停</el-button>
<el-button @click="continueScan()" style="margin-left: 0px;margin-top:0px" type="primary">派工单继续</el-button>
<download-excel
:fields="exportDataStandard"
:data="tableData"
@ -82,7 +103,6 @@
class="el-button el-button--primary el-button--medium">
{{'导出'}}
</download-excel>
</el-form-item>
</el-form>
<el-table
@ -236,6 +256,28 @@
<el-button type="primary" @click="startModalFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<el-dialog title="派工单暂停" :close-on-click-modal="false" v-drag :visible.sync="stopModalFlag" width="215px">
<el-form :inline="true" label-position="top" style="margin-left: 22px;margin-top: -5px;" @submit.native.prevent>
<el-form-item :label="'派工单号：'">
<el-input v-model="scanSeqNo" ref="stop" type="number" style="width: 130px;" @keyup.enter.native="stopWork()"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="stopWork()">开始</el-button>
<el-button type="primary" @click="stopModalFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<el-dialog title="派工单继续" :close-on-click-modal="false" v-drag :visible.sync="continueModalFlag" width="215px">
<el-form :inline="true" label-position="top" style="margin-left: 22px;margin-top: -5px;" @submit.native.prevent>
<el-form-item :label="'派工单号：'">
<el-input v-model="scanSeqNo" ref="continue" type="number" style="width: 130px;" @keyup.enter.native="continueWork()"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="continueWork()">开始</el-button>
<el-button type="primary" @click="continueModalFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<el-dialog @close="closeDialog" :close-on-click-modal="false" :close-on-press-escape="false" v-drag title="报告信息" :visible.sync="setUp.reviewFlag" width="615px">
<el-form :inline="true" label-position="top">
<el-form-item label="派工单号">
@ -427,6 +469,8 @@
searchReportedQty,
searchSeqNo,
startSeqNo,
stopWork,
continueWork,
} from '@/api/production/generateReport.js'
import Chooselist from '@/views/modules/common/Chooselist'
import {
@ -479,6 +523,8 @@
userId:'',
},
scanSeqNo:'',
stopModalFlag:false,
continueModalFlag:false,
qty1:'',
qty2:'',
qty3:'',
@ -827,6 +873,16 @@
this.startModalFlag=true;
this.$nextTick(() => { this.$refs.start.focus();})
},
stopScan(){
this.scanSeqNo='';
this.stopModalFlag=true;
this.$nextTick(() => { this.$refs.stop.focus();})
},
continueScan(){
this.scanSeqNo='';
this.continueModalFlag=true;
this.$nextTick(() => { this.$refs.continue.focus();})
},
searchSeqNo(){
if(this.scanSeqNo==''){
this.$alert("请扫描派工单！",'错误', {
@ -982,6 +1038,54 @@
}
})
},
stopWork(){
let inData={
site:this.$store.state.user.site,
username:this.$store.state.user.name,
seqNo:this.scanSeqNo
}
stopWork(inData).then(({data}) => {
if (data && data.code === 0) {
this.scanSeqNo='';
this.stopModalFlag=false;
this.$message({
message: '派工单已暂停',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
continueWork(){
let inData={
site:this.$store.state.user.site,
username:this.$store.state.user.name,
seqNo:this.scanSeqNo
}
continueWork(inData).then(({data}) => {
if (data && data.code === 0) {
this.scanSeqNo='';
this.continueModalFlag=false;
this.$message({
message: '派工单已继续',
type: 'success',
duration: 1500,
onClose: () => {
}
})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
},
created () {
}

11
src/views/modules/production/print_seqNo_label.js
View File

@ -43,13 +43,13 @@ export function printSeqNoLabel(printList) {
LODOP.ADD_PRINT_TEXT(168,110,141,25,printData.orderNo);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(66,8,96,25,"Qty:");
LODOP.ADD_PRINT_TEXT(66,8,96,25,"Q.T.Y:");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.qtyRequired);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(194,8,128,25,"Work Date:");
LODOP.ADD_PRINT_TEXT(194,8,128,25,"MFG Date:");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(194,110,170,25,printData.sScheduledDate);
@ -57,17 +57,18 @@ export function printSeqNoLabel(printList) {
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,259,109,25,"vender Code:");
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.PRINT_DESIGN();
LODOP.PRINT_DESIGN();
//LODOP.PREVIEW();
LODOP.PRINT();
// LODOP.PRINT();
console.log("操作成功！")
}
}

18
src/views/modules/production/print_stock_label.js
View File

@ -13,7 +13,7 @@ export function printMaterialLabel(printList) {
LODOP.NewPage();
LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
LODOP.ADD_PRINT_BARCODE(43,244,208,140,"QRCode",printData.seqNo);
LODOP.ADD_PRINT_TEXT(90,8,133,25,"WareHouse Id:");
LODOP.ADD_PRINT_TEXT(90,8,133,25,"WareHouse ID:");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(90,110,140,25,printData.wareHouseId);
@ -25,7 +25,7 @@ export function printMaterialLabel(printList) {
LODOP.ADD_PRINT_TEXT(143,110,140,20,printData.batchNo);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(116,8,124,25,"Location Id:");
LODOP.ADD_PRINT_TEXT(116,8,124,25,"Location ID:");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(116,110,139,25,printData.locationId);
@ -43,30 +43,32 @@ export function printMaterialLabel(printList) {
LODOP.ADD_PRINT_TEXT(168,110,141,25,printData.orderNo);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(66,8,56,25,"Qty:");
LODOP.ADD_PRINT_TEXT(66,8,81,25,"Q.T.Y:");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(66,110,138,24,printData.qty);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(194,8,92,25,"TransDate:");
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,170,25,printData.transDate);
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,259,109,25,"vender Code:");
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.PRINT_DESIGN();
LODOP.PRINT_DESIGN();
//LODOP.PREVIEW();
LODOP.PRINT();
// LODOP.PRINT();
console.log("操作成功！")
}
}

15
src/views/modules/production/print_transNo_label.js
View File

@ -25,7 +25,7 @@ export function printTransNoLabel(printList) {
LODOP.ADD_PRINT_TEXT(143,110,140,20,printData.seqNo);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(116,8,113,25,"WorkCenterNo:");
LODOP.ADD_PRINT_TEXT(116,8,113,25,"Equip No:");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(116,110,139,25,printData.workCenterNo);
@ -43,31 +43,32 @@ export function printTransNoLabel(printList) {
LODOP.ADD_PRINT_TEXT(168,110,141,25,printData.orderNo);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(66,8,96,25,"TransQty:");
LODOP.ADD_PRINT_TEXT(66,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(66,110,138,24,printData.transQty);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(194,8,97,25,"TransDate:");
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,170,25,printData.transDate);
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,259,109,25,"vender Code:");
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.PRINT_DESIGN();
LODOP.PRINT_DESIGN();
//LODOP.PREVIEW();
LODOP.PRINT();
// LODOP.PRINT();
console.log("操作成功！")
}
}

2
src/views/modules/production/stockPrint.vue
View File

@ -240,7 +240,7 @@
seqNo:row.site+'|'+row.partNo+'|'+row.wareHouseId+'|'+row.batchNo+'|'+row.locationId,
site:row.site,
wareHouseId:row.wareHouseId,
batchNo:row.wareHouseId,
batchNo:row.batchNo,
locationId:row.locationId,
partNo:row.partNo,
orderNo:row.orderNo,

Write Preview
Loading…
Cancel
Save