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
2c408420d5
commit
63acc2da6d
9 changed files with 39 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/views/modules/print/print_outBox_label.js
  2. 6
      src/views/modules/production/cancelSfdc.vue
  3. 6
      src/views/modules/production/closeSchedule.vue
  4. 4
      src/views/modules/production/dailyPlan.vue
  5. 6
      src/views/modules/production/generateReport.vue
  6. 6
      src/views/modules/production/scheduleForSOTask.vue
  7. 6
      src/views/modules/production/scheduleForShopOrder.vue
  8. 6
      src/views/modules/production/searchSfdc.vue
  9. 6
      src/views/modules/production/soscheduleRouting.vue

24
src/views/modules/print/print_outBox_label.js
View File

@ -81,21 +81,22 @@ export function printOutBoxLabel(printList) {
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(307,237,58,25,"Q.T.Y"); LODOP.ADD_PRINT_TEXT(307,237,58,25,"Q.T.Y");
LODOP.SET_PRINT_STYLEA(0,"FontName","Arial"); LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",13); LODOP.SET_PRINT_STYLEA(0,"FontSize",13);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(69,63,149,25,printData.partSpec); 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); LODOP.SET_PRINT_STYLEA(0,"Bold",1);
if(printData.iconInfo!=''&&printData.iconInfo!=null) { if(printData.iconInfo!=''&&printData.iconInfo!=null) {
// LODOP.ADD_PRINT_IMAGE(185,425,99,50, "<img src='http://192.168.1.83:81/upload/A.jpg'/>"); // LODOP.ADD_PRINT_IMAGE(185,425,99,50, "<img src='http://192.168.1.83:81/upload/A.jpg'/>");
LODOP.ADD_PRINT_IMAGE(185,425,99,50, "<img src='http://192.168.2.172:80/print/" + printData.iconInfo + ".jpg'/>");
LODOP.ADD_PRINT_IMAGE(188,9,77,46, "<img src='http://192.168.2.172:80/print/" + printData.iconInfo + ".jpg'/>");
LODOP.SET_PRINT_STYLEA(0,"Stretch",2); LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
} }
if(printData.code=='CODE128') { 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.ADD_PRINT_BARCODE(248,13,214,46,"128A",printData.partSpec);
LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
LODOP.ADD_PRINT_BARCODE(248,240,120,46,"128A",printData.unitQty); LODOP.ADD_PRINT_BARCODE(248,240,120,46,"128A",printData.unitQty);
LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); 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); LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
}else { }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.ADD_PRINT_BARCODE(248,13,214,46,"Code39",printData.partSpec);
LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0);
LODOP.ADD_PRINT_BARCODE(248,240,120,46,"Code39",printData.unitQty); LODOP.ADD_PRINT_BARCODE(248,240,120,46,"Code39",printData.unitQty);
LODOP.SET_PRINT_STYLEA(0,"ShowBarText",0); 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.SET_PRINT_STYLEA(0,"ShowBarText",0);
} }
LODOP.ADD_PRINT_TEXT(307,64,170,25,printData.partSpec); 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); 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,"FontName","Arial");
LODOP.SET_PRINT_STYLEA(0,"FontSize",11); LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); 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,"FontSize",12);
LODOP.SET_PRINT_STYLEA(0,"Alignment",2); LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_LINE(240,88,180,89,0,1);
// LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90); // LODOP.SET_PRINT_STYLEA(1,"AngleOfPageInside",-90);
} }

6
src/views/modules/production/cancelSfdc.vue
View File

@ -14,8 +14,8 @@
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span> <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
<el-input v-model="searchData.partNo" style="width: 120px"></el-input> <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'工序编号'">
<el-input v-model="searchData.itemNo" style="width: 120px"></el-input>
<el-form-item :label="'规格型号'">
<el-input v-model="searchData.partDesc" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'加工中心编号'"> <el-form-item :label="'加工中心编号'">
<el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input> <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
@ -564,7 +564,7 @@
workCenterNo: '', workCenterNo: '',
partNo: '', partNo: '',
site: this.$store.state.user.site, site: this.$store.state.user.site,
itemNo:'',
partDesc:'',
startDate:new Date(), startDate:new Date(),
endDate:'', endDate:'',
operatorName:'', operatorName:'',

6
src/views/modules/production/closeSchedule.vue
View File

@ -18,8 +18,8 @@
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span> <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
<el-input v-model="searchData.partNo" style="width: 120px"></el-input> <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'工序名称'">
<el-input v-model="searchData.itemDesc" style="width: 120px"></el-input>
<el-form-item :label="'规格型号'">
<el-input v-model="searchData.partDesc" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'派工单类型'"> <el-form-item :label="'派工单类型'">
<el-select v-model="searchData.scheduleType" style="width: 120px"> <el-select v-model="searchData.scheduleType" style="width: 120px">
@ -452,7 +452,7 @@
sWorkCenterNo: '', sWorkCenterNo: '',
partNo: '', partNo: '',
site: '', site: '',
itemDesc:'',
partDesc:'',
scheduleType:'', scheduleType:'',
reportFlag:'QtyRequired>QtyReported', reportFlag:'QtyRequired>QtyReported',
startDate:'', startDate:'',

4
src/views/modules/production/dailyPlan.vue
View File

@ -83,6 +83,9 @@
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">物料编码</a></span> <span slot="label" style="" @click="getBaseList(5)"><a herf="#">物料编码</a></span>
<el-input v-model="searchData.partNo" style="width: 130px"></el-input> <el-input v-model="searchData.partNo" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'规格型号：'">
<el-input v-model="searchData.partDescription" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'排产情况：'"> <el-form-item :label="'排产情况：'">
<el-select filterable v-model="searchData.planStatus" style="width: 120px"> <el-select filterable v-model="searchData.planStatus" style="width: 120px">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
@ -403,6 +406,7 @@
schedulingFlag: false, schedulingFlag: false,
tableData: [], tableData: [],
searchData: { searchData: {
partDescription:'',
orderNo: '', orderNo: '',
startDate1: new Date(), startDate1: new Date(),
endDate1: '', endDate1: '',

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

@ -18,8 +18,8 @@
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span> <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
<el-input v-model="searchData.partNo" style="width: 120px"></el-input> <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'工序名称'">
<el-input v-model="searchData.itemDesc" style="width: 120px"></el-input>
<el-form-item :label="'规格型号'">
<el-input v-model="searchData.partDesc" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'派工单类型'"> <el-form-item :label="'派工单类型'">
<el-select v-model="searchData.scheduleType" style="width: 120px"> <el-select v-model="searchData.scheduleType" style="width: 120px">
@ -694,7 +694,7 @@
sWorkCenterNo: '', sWorkCenterNo: '',
partNo: '', partNo: '',
site: '', site: '',
itemDesc:'',
partDesc:'',
scheduleType:'', scheduleType:'',
reportFlag:"closedFlag='N'", reportFlag:"closedFlag='N'",
startDate:'', startDate:'',

6
src/views/modules/production/scheduleForSOTask.vue
View File

@ -11,8 +11,8 @@
<el-form-item :label="'生产订单号：'"> <el-form-item :label="'生产订单号：'">
<el-input v-model="searchData.orderRef1" style="width: 120px"></el-input> <el-input v-model="searchData.orderRef1" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'工序号：'">
<el-input v-model="searchData.itemNo" style="width: 120px"></el-input>
<el-form-item :label="'规格型号：'">
<el-input v-model="searchData.partDescription" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'计划日期：'"> <el-form-item :label="'计划日期：'">
<el-date-picker <el-date-picker
@ -541,7 +541,7 @@
orderRef1:'', orderRef1:'',
site: '', site: '',
planStatus: 'a.OrderQty>isnull(SL.scheduledQty,0)', planStatus: 'a.OrderQty>isnull(SL.scheduledQty,0)',
itemNo:'',
partDescription:'',
finishFlag:'', finishFlag:'',
userId:this.$store.state.user.name, userId:this.$store.state.user.name,
}, },

6
src/views/modules/production/scheduleForShopOrder.vue
View File

@ -50,8 +50,8 @@
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="'工序号：'">
<el-input v-model="searchData.itemNo" style="width: 120px"></el-input>
<el-form-item :label="'规格型号：'">
<el-input v-model="searchData.partDescription" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;"> <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;">
@ -578,7 +578,7 @@
endDate4: '', endDate4: '',
site: '', site: '',
planStatus: 'ROUND(a.LotSize,3) >ROUND(ISNULL(SL.scheduledQty,0),3)', planStatus: 'ROUND(a.LotSize,3) >ROUND(ISNULL(SL.scheduledQty,0),3)',
itemNo:'',
partDescription:'',
userId:this.$store.state.user.name, userId:this.$store.state.user.name,
}, },
weightFactorFlag:false, weightFactorFlag:false,

6
src/views/modules/production/searchSfdc.vue
View File

@ -14,8 +14,8 @@
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span> <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
<el-input v-model="searchData.partNo" style="width: 120px"></el-input> <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'工序编号'">
<el-input v-model="searchData.itemNo" style="width: 120px"></el-input>
<el-form-item :label="'规格型号'">
<el-input v-model="searchData.partDesc" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'加工中心编号'"> <el-form-item :label="'加工中心编号'">
<el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input> <el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input>
@ -552,7 +552,7 @@
workCenterNo: '', workCenterNo: '',
partNo: '', partNo: '',
site: this.$store.state.user.site, site: this.$store.state.user.site,
itemNo:'',
partDesc:'',
startDate:new Date(), startDate:new Date(),
endDate:'', endDate:'',
operatorName:'', operatorName:'',

6
src/views/modules/production/soscheduleRouting.vue
View File

@ -18,8 +18,8 @@
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span> <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
<el-input v-model="searchData.partNo" style="width: 120px"></el-input> <el-input v-model="searchData.partNo" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'工序名称'">
<el-input v-model="searchData.itemDesc" style="width: 120px"></el-input>
<el-form-item :label="'规格型号'">
<el-input v-model="searchData.partDesc" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'派工单类型'"> <el-form-item :label="'派工单类型'">
<el-select v-model="searchData.scheduleType" style="width: 120px"> <el-select v-model="searchData.scheduleType" style="width: 120px">
@ -413,7 +413,7 @@
seqNo:'', seqNo:'',
partNo: '', partNo: '',
site: '', site: '',
itemDesc:'',
partDesc:'',
scheduleType:'', scheduleType:'',
reportFlag:'QtyRequired>QtyApprove', reportFlag:'QtyRequired>QtyApprove',
startDate:'', startDate:'',

Write Preview
Loading…
Cancel
Save