main
FOAM 2025-08-11 18:02:06 +08:00
parent 688325f852
commit 71c814905b
11 changed files with 25681 additions and 788 deletions

25314
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -92,6 +92,14 @@ export function putawayConfirm(data) {
})
}
export function collectPutAway(data) {
return request({
url: 'api/asnDetail/collectPutAway',
method: 'post',
data
})
}
export function collectMOCreate(data) {
return request({
url: 'api/asnDetail/createMoInfo',
@ -104,4 +112,4 @@ export function collectMOCreate(data) {
export default { add, del,edit,doCheckAsn,collectMOCreate,updateContainer,queryAsnDetailAll,putawayConfirm,rkAndQxButtonQX,cancelPut}
export default { add, del,edit,doCheckAsn,collectMOCreate,updateContainer,queryAsnDetailAll,putawayConfirm,rkAndQxButtonQX,cancelPut,collectPutAway}

View File

@ -1,4 +1,5 @@
import request from '@/utils/request'
import qs from "qs";
export function queryBomAccountList(params) {
return request({
url: 'api/bomAccount/queryBomAccountList',
@ -52,4 +53,19 @@ export function edit(data) {
})
}
export default { add, edit, del,queryBomAccountPoints }
export function queryBomPrintList(data) {
return request({
url: 'api/bomAccount/queryBomPrintList' + '?' + qs.stringify(data, { indices: false }),
method: 'get',
data
})
}
export function bomPrintBiaoQianList() {
return request({
url: 'api/bomAccount/bomPrintBiaoQianList',
method: 'get'
})
}
export default { add, edit, del, queryBomAccountPoints, queryBomPrintList }

View File

@ -47,11 +47,11 @@
<el-form-item label="库区名称" prop="name">
<el-input v-model="form.name" style="width: 370px;"/>
</el-form-item>
<el-form-item label="排序号" prop="name">
<!-- <el-form-item label="排序号" prop="name">
<el-input v-model="form.posX" style="width: 370px;"/>
</el-form-item>
<el-form-item label="接收工厂" >
<!-- <el-input v-model="form.workingStation" style="width: 370px;" />-->
<el-input v-model="form.workingStation" style="width: 370px;" />
<el-select v-model="form.gcCode" filterable placeholder="请选择" clearable>
<el-option
v-for="item in this.dict.factory"
@ -61,14 +61,15 @@
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="描述">
<el-input v-model="form.description" style="width: 370px;"/>
</el-form-item>
<el-form-item label="接收担当">
<el-input v-model="form.shdd" style="width: 370px;"/>
</el-form-item>
<el-form-item label="所属工位">
</el-form-item> -->
<el-form-item label="描述">
<el-input v-model="form.description" style="width: 370px;"/>
</el-form-item>
<el-form-item label="所属纳所">
<!-- <el-input v-model="form.workingStation" style="width: 370px;" />-->
<el-select v-model="form.workingStation" filterable placeholder="请选择" clearable>
<el-option
@ -106,10 +107,10 @@
</template>
</el-table-column>
<el-table-column prop="pointCode" label="缓存库位"/>
<el-table-column prop="posX" label="排序号">
<!-- <el-table-column prop="posX" label="排序号">
</el-table-column>
<el-table-column prop="gcCode" label="接收工厂"/>
<el-table-column prop="shdd" label="接收担当"/>
<el-table-column prop="shdd" label="接收担当"/>-->
<el-table-column prop="description" label="描述"/>
<el-table-column prop="bexb" label="线边接收">
<template slot-scope="scope">

View File

@ -42,6 +42,9 @@
<el-form-item label="完成品品番" prop="code" >
<el-input v-model="form.code" style="width: 180px;" />
</el-form-item>
<el-form-item label="主形式名" prop="masterName">
<el-input v-model="form.masterName" style="width: 180px;" />
</el-form-item>
<el-form-item label="完成形式名" prop="name">
<el-input v-model="form.name" style="width: 180px;" />
</el-form-item>
@ -51,9 +54,12 @@
<el-form-item label="国别" prop="country">
<el-input v-model="form.country" style="width: 180px;" />
</el-form-item>
<!--
<el-form-item label="出库类型" prop="outboundType">
<el-input v-model="form.outboundType" style="width: 180px;" />
</el-form-item>
-->
<el-form-item label="描述">
<el-input v-model="form.description" :rows="3" type="textarea" style="width: 370px;"/>
</el-form-item>
@ -67,11 +73,12 @@
<el-table ref="table" v-loading="crud.loading" :height="crud.tableHeight" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler" border>
<el-table-column type="selection" width="55" />
<el-table-column prop="code" label="完成品品番" />
<el-table-column prop="name" label="完成形式名" width="220px" align="center" />
<el-table-column prop="masterName" label="主形式名"/>
<el-table-column prop="name" label="完成形式名"/>
<el-table-column prop="models" label="机种" />
<el-table-column prop="country" label="国别" />
<el-table-column prop="outboundType" label="出库类型" />
<!-- <el-table-column prop="enabled" label="是否启用" />-->
<!-- <el-table-column prop="outboundType" label="出库类型" />
<el-table-column prop="enabled" label="是否启用" />-->
<el-table-column prop="enabled" label="启用" width="50">
<template slot-scope="scope">
<el-switch
@ -153,12 +160,6 @@ export default {
],
models: [
{ required: true, message: '机种不能为空', trigger: 'blur' }
],
country: [
{ required: true, message: '国别不能为空', trigger: 'blur' }
],
outboundType: [
{ required: true, message: '出库类型不能为空', trigger: 'blur' }
]
},
queryTypeOptions: [

View File

@ -7,7 +7,7 @@
<el-input v-model="query.bigItemName" clearable placeholder="完成品名" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<el-input v-model="query.itemCode" clearable placeholder="部品品番" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<el-input v-model="query.itemName" clearable placeholder="部品品名" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<el-select v-model="query.rAreaCode" clearable placeholder="工位" filterable style="width: 185px;" class="filter-item"
<!--<el-select v-model="query.rAreaCode" clearable placeholder="工位" filterable style="width: 185px;" class="filter-item"
@keyup.enter.native="crud.toQuery" clearable>
<el-option
v-for="baseStatus in dict.station_type"
@ -26,8 +26,7 @@
:label="baseStatus.label"
:value="baseStatus.value"
/>
</el-select>
<!-- <el-input v-model="query.rAreaCode" clearable placeholder="接收库区" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
</el-select>-->
<el-select v-model="query.rAreaCode" value-key="id" filterable placeholder="接收库区" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" clearable>
<el-option
v-for="item in rAreaList"
@ -35,8 +34,8 @@
:label="item.name"
:value="item.code"
/>
</el-select>-->
<!-- <el-input v-model="query.cAreaCode" clearable placeholder="出库库区" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />-->
</el-select>
<!--
<el-select v-model="query.cAreaCode" value-key="id" filterable placeholder="出库库区" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" clearable>
<el-option
v-for="item in cAreaList"
@ -44,7 +43,7 @@
:label="item.name"
:value="item.code"
/>
</el-select>
</el-select>-->
<el-input v-model="query.zPointCode" clearable placeholder="制造库位" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
<date-range-picker v-model="query.createTime" class="date-item" style="width: 100px"/>
@ -63,6 +62,19 @@
:show-file-list="true">
<el-button size="mini" type="success" v-permission="permission.import" icon="el-icon-upload"></el-button>
</el-upload>
<el-upload
class="upload-demo"
ref="upload"
slot='right'
style="float: right;padding-left: 5px"
:action="baseApi+'/api/importData/bomAccountBatch'"
:file-list="fileList"
:on-success=handleSuccess
:on-error="handleError"
:headers="headers"
:show-file-list="true">
<el-button size="mini" type="success" v-permission="permission.import" icon="el-icon-upload">()</el-button>
</el-upload>
<el-button
slot="right"
class="filter-item"
@ -83,6 +95,17 @@
>
下载EXCEL
</el-button>
<el-button
slot="right"
class="filter-item"
type="primary"
size="mini"
@click="saveBomPrint()"
v-permission="permission.showReport"
icon="el-icon-document-add"
>
打印库位标签
</el-button>
<el-link href="/jmreport/view/912967151437389824" >导出</el-link>
</crudOperation>
<!--表单组件-->
@ -108,7 +131,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="出库类型" prop="outType">
<!-- <el-form-item label="出库类型" prop="outType">
<el-select v-model="form.outType" filterable placeholder="请选择" style="width: 180px;">
<el-option
v-for="item in dict.out_type"
@ -117,6 +140,28 @@
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="部品种类" prop="bp_type">
<el-select v-model="form.bp_type" filterable placeholder="请选择" style="width: 180px;">
<el-option
v-for="item in dict.bp_type"
:key="item.id"
:label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="出库库区" prop="cArea" >
<el-select v-model="form.cArea" value-key="id" filterable placeholder="请选择" style="width: 180px;">
<el-option
v-for="item in cAreaList"
:key="item.id"
:label="item.name"
:value="item"
/>
</el-select>
</el-form-item>
-->
<el-form-item label="加工内容" prop="contents">
<el-input v-model="form.contents" style="width: 180px;" />
</el-form-item>
@ -129,15 +174,6 @@
<el-form-item label="制造库位" prop="zPoint">
<el-input v-model="form.zPoint.code" style="width: 180px;" />
</el-form-item>
<el-form-item label="部品种类" prop="bp_type">
<el-select v-model="form.bp_type" filterable placeholder="请选择" style="width: 180px;">
<el-option
v-for="item in dict.bp_type"
:key="item.id"
:label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="指示纳所" prop="rArea" >
<el-select v-model="form.rArea" value-key="id" filterable placeholder="请选择" style="width: 180px;">
<el-option
@ -147,16 +183,7 @@
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="出库库区" prop="cArea" >
<el-select v-model="form.cArea" value-key="id" filterable placeholder="请选择" style="width: 180px;">
<el-option
v-for="item in cAreaList"
:key="item.id"
:label="item.name"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item label="描述" prop="description">
@ -168,14 +195,16 @@
<el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU"></el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table id="mytable" ref="table" border :height="crud.tableHeight" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler" >
<el-table-column type="selection" width="55" />
<el-table-column prop="id" label="序号" width="60" />
<el-table-column prop="bigItem.code" label="完成品品番" width="120" />
<el-table-column prop="bigItem.name" label="完成品形式名" width="150" align="center"/>
<el-table-column prop="rArea.code" label="工位" width="80"/>
<el-table-column prop="rArea.name" label="指示纳所" width="250"/>
<el-table-column prop="bigItem.masterName" label="完成品形式名" width="150" align="center"/>
<!--<el-table-column prop="rArea.code" label="工位" width="80"/>-->
<el-table-column prop="ns" label="纳所"/>
<el-table-column prop="item.code" label="部品品番" width="100"/>
<el-table-column prop="item.name" label="品名" width="150"/>
<el-table-column prop="ac" label="A/C" width="50"/>
@ -185,8 +214,13 @@
</template>
</el-table-column>
<el-table-column prop="singles" label="单用" width="50"/>
<el-table-column prop="zPoint.code" label="制造库位" />
<el-table-column prop="cArea.code" label="出库库区" width="150" align="center" />
<el-table-column prop="zPoint.code" label="货位" />
<el-table-column prop="xz" label="箱种"/>
<el-table-column prop="srs" label="收容数"/>
<el-table-column prop="tckw" label="台车库位"/>
<el-table-column prop="bp_type" label="大小物"/>
<el-table-column prop="bonded" label="税别"/>
<!-- <el-table-column prop="cArea.code" label="出库库区" width="150" align="center" />
<el-table-column prop="out_type#outType" label="出库类型" width="70">
<template slot-scope="scope">
{{ dict.label.out_type[scope.row.outType] }}
@ -196,7 +230,7 @@
<template slot-scope="scope">
{{ dict.label.bp_type[scope.row.bp_type] }}
</template>
</el-table-column>
</el-table-column>-->
<el-table-column prop="updateTime" label="操作日期" width="135">
<template slot-scope="scope">
{{getFormatDate(scope.row.updateTime)}}
@ -231,7 +265,7 @@
<script>
import {exportExcel} from '@/components/TableToExcel/ExportExcel'
import {initData} from '@/api/data'
import crudBomAccount from '@/api/bomAccount'
import crudBomAccount ,{queryBomPrintList}from '@/api/bomAccount'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
@ -393,6 +427,16 @@ export default {
})
})
},
saveBomPrint() {
console.log("打印")
queryBomPrintList(this.crud.getQueryParams2()).then(res => {
this.showEwmReport();
})
},
showEwmReport(){
this.$router.push({path:'/base-data/base-ware/point_print',query:{tableID: '打印中大物标签'}})
},
showReport(){
this.$router.push({path:'/DaoChu/ExcelDaoChu',query:{tableID: 'Bom工位清单导出'}})
},

View File

@ -0,0 +1,106 @@
<template>
<el-dialog
title="满车入库"
:visible.sync="dialogVisible"
width="400px"
:before-close="handleClose">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="容器" prop="containerCode">
<el-input v-model="form.stockCode" placeholder="请输入容器号"></el-input>
</el-form-item>
<el-form-item label="点位" prop="pointCode">
<el-input v-model="form.pointCode" placeholder="请输入点位"></el-input>
</el-form-item>
<el-form-item label="物料" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入物料"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="cancelForm"> </el-button>
<el-button type="primary" @click="stockInConfirm"> </el-button>
</span>
</el-dialog>
</template>
<script>
import crud from '@/mixins/crud'
import pointUrl, { fullStockIn } from '@/api/point'
import CRUD from '@crud/crud'
export default {
mixins: [crud],
data() {
return {
dialogVisible: false,
FullStockIn: {
itemCode: '',
stockCode: '',
agvScene: '',
pointCode: ''
},
rules: {
pointCode: [
{required: true, message: '点位必填', trigger: 'blur'}
],
stockCode: [
{required: true, message: '容器必填', trigger: 'blur'}
],
itemCode: [
{required: true, message: '物料必填', trigger: 'blur'}
]
}
};
},
methods: {
//
handleClose(done) {
done();
},
stockInClick(data){
this.form.pointCode=data.code;
},
stockInConfirm() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.FullStockIn.stockCode = this.form.stockCode
this.FullStockIn.pointCode = this.form.pointCode
this.FullStockIn.itemCode = this.form.itemCode
this.FullStockIn.agvScene="ZC"
pointUrl.fullStockIn(this.FullStockIn).then(res => {
if(res.status==200){
this.dialogVisible = false
this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
this.$parent.shuaxinContainerList()
this.$refs['form'].resetFields();
}else{
this.$parent.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
}
}).catch(() => {
})
} else {
return false;
}
});
},
cancelForm() {
this.dialogVisible = false
this.$refs['form'].resetFields();
}
}
};
</script>
<style scoped>
</style>

View File

@ -83,6 +83,12 @@
<el-form-item label="名称">
<el-input v-model="form.name" style="width: 370px;"/>
</el-form-item>
<el-form-item label="品番">
<el-input v-model="form.itemCode" style="width: 370px;"/>
</el-form-item>
<el-form-item label="纳所">
<el-input v-model="form.beatCode" style="width: 370px;"/>
</el-form-item>
<el-form-item label="类型" prop="type">
<el-select v-model="form.type" filterable placeholder="请选择" style="width: 370px;"
:default-first-option="true"
@ -130,6 +136,8 @@
</el-table-column>
<el-table-column prop="code" label="代码"/>
<el-table-column prop="name" label="名称"/>
<el-table-column prop="itemCode" label="品番"/>
<el-table-column prop="beatCode" label="纳所"/>
<el-table-column prop="point_type#type" label="类型">
<template slot-scope="scope">
{{ dict.label.point_type[scope.row.type] }}
@ -145,13 +153,8 @@
/>
</template>
</el-table-column>
<el-table-column prop="description" label="描述"
width="330px"
>
<template slot-scope="scope">
{{ scope.row.description }}
</template>
</el-table-column>
<el-table-column prop="description" label="描述"/>
<el-table-column v-if="checkPer(['admin','item:edit'])" label="操作" width="60px" align="center">
<template slot-scope="scope">
<udOperation

View File

@ -5,7 +5,7 @@
<button @click="getPointListData"></button>
<div class="container" >
<!-- 标签容器 - 使用flex布局实现每行两个 -->
<div id="printMe" v-for="(group, groupIndex) in groupedLocations" :key="groupIndex" class="group-container">
<div id="printMe" v-for="(group, groupIndex) in groups" :key="groupIndex" class="group-container">
<div
v-for="(location, indexInGroup) in group"
:key="groupIndex * 3 + indexInGroup"
@ -30,7 +30,7 @@
<td class="td-item" colspan="2">制库</td>
<td class="td-item-value" colspan="4">{{ location.boxType }}</td>
<td class="td-item" colspan="2">税别</td>
<td class="td-item-value" colspan="2">{{ location.boxType }}</td>
<td class="td-item-value" colspan="2">{{ location.bonded }}</td>
</tr>
<tr>
<td class="td-item" colspan="3">供应商</td>
@ -81,7 +81,7 @@ import CRUD, {crud, form, header, presenter} from "@crud/crud";
import crudStock from "@/api/stock";
import {getToken} from "@/utils/auth";
import {getStockTypes} from "@/api/stockType";
import {queryPointList} from "@/api/point";
import {bomPrintBiaoQianList} from "@/api/bomAccount";
import {getAres} from "@/api/area";
import VueQrcode from '@chenfengyuan/vue-qrcode';
@ -95,14 +95,7 @@ export default {
print: vPrint
},
computed: {
groupedLocations() {
const groups = [];
// 3
for (let i = 0; i < this.locations.length; i += 3) {
groups.push(this.locations.slice(i, i + 3));
}
return groups;
}
},
data() {
@ -114,579 +107,17 @@ export default {
},
qrSize: 120, //
// - API
locations: [
{
name: "A区-01-001",
qrValue: "A01-001",
productCode: "00221/RE556-06022",
boxType: "SPT",
productName: "侧板LB-2",
capacity: "20",
materialWarehouse: "U20101",
productionWarehouse: "121012",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", " U20上 ", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "A区-01-002",
qrValue: "A01-002",
productCode: "00221/RE556-06023",
boxType: "SPT",
productName: "侧板RB-2",
capacity: "20",
materialWarehouse: "U20102",
productionWarehouse: "121013",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "B区-02-101",
qrValue: "B02-101",
productCode: "00345/TC789-12001",
boxType: "LPR",
productName: "液压阀组件",
capacity: "5",
materialWarehouse: "U30567",
productionWarehouse: "131045",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "液压科技",
applicableModels: ["U30全系", "RX305", "RX306", "RDL系列"],
usageQuantities: ["1", "1", "2", "1"]
},
{
name: "C区-03-205",
qrValue: "C03-205",
productCode: "00456/MK321-04511",
boxType: "MCT",
productName: "控制模块V3",
capacity: "10",
materialWarehouse: "U40899",
productionWarehouse: "141202",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "电子创新",
applicableModels: ["U20全系", "RX全系", "RDL全系", "EX系列"],
usageQuantities: ["1", "1", "1", "―"]
},
{
name: "D区-04-301",
qrValue: "D04-301",
productCode: "00567/PT456-78900",
boxType: "HVB",
productName: "高压油管组件",
capacity: "8",
materialWarehouse: "U50123",
productionWarehouse: "151078",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "液压管道",
applicableModels: ["U35动臂", "U40斗杆", "RX307", "EX45"],
usageQuantities: ["2", "1", "1", "1"]
},
{
name: "E区-05-122",
qrValue: "E05-122",
productCode: "00678/BD123-45678",
boxType: "FGP",
productName: "履带板组件",
capacity: "4",
materialWarehouse: "U60789",
productionWarehouse: "161234",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "机械制造",
applicableModels: ["U35全系", "U40全系", "RX308", "EX60"],
usageQuantities: ["4", "4", "2", "2"]
},
{
name: "A区-01-001",
qrValue: "A01-001",
productCode: "00221/RE556-06022",
boxType: "SPT",
productName: "侧板LB-2",
capacity: "20",
materialWarehouse: "U20101",
productionWarehouse: "121012",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "A区-01-002",
qrValue: "A01-002",
productCode: "00221/RE556-06023",
boxType: "SPT",
productName: "侧板RB-2",
capacity: "20",
materialWarehouse: "U20102",
productionWarehouse: "121013",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "B区-02-101",
qrValue: "B02-101",
productCode: "00345/TC789-12001",
boxType: "LPR",
productName: "液压阀组件",
capacity: "5",
materialWarehouse: "U30567",
productionWarehouse: "131045",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "液压科技",
applicableModels: ["U30全系", "RX305", "RX306", "RDL系列"],
usageQuantities: ["1", "1", "2", "1"]
},
{
name: "C区-03-205",
qrValue: "C03-205",
productCode: "00456/MK321-04511",
boxType: "MCT",
productName: "控制模块V3",
capacity: "10",
materialWarehouse: "U40899",
productionWarehouse: "141202",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "电子创新",
applicableModels: ["U20全系", "RX全系", "RDL全系", "EX系列"],
usageQuantities: ["1", "1", "1", "―"]
},
{
name: "D区-04-301",
qrValue: "D04-301",
productCode: "00567/PT456-78900",
boxType: "HVB",
productName: "高压油管组件",
capacity: "8",
materialWarehouse: "U50123",
productionWarehouse: "151078",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "液压管道",
applicableModels: ["U35动臂", "U40斗杆", "RX307", "EX45"],
usageQuantities: ["2", "1", "1", "1"]
},
{
name: "E区-05-122",
qrValue: "E05-122",
productCode: "00678/BD123-45678",
boxType: "FGP",
productName: "履带板组件",
capacity: "4",
materialWarehouse: "U60789",
productionWarehouse: "161234",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "机械制造",
applicableModels: ["U35全系", "U40全系", "RX308", "EX60"],
usageQuantities: ["4", "4", "2", "2"]
},
{
name: "A区-01-001",
qrValue: "A01-001",
productCode: "00221/RE556-06022",
boxType: "SPT",
productName: "侧板LB-2",
capacity: "20",
materialWarehouse: "U20101",
productionWarehouse: "121012",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "A区-01-002",
qrValue: "A01-002",
productCode: "00221/RE556-06023",
boxType: "SPT",
productName: "侧板RB-2",
capacity: "20",
materialWarehouse: "U20102",
productionWarehouse: "121013",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "B区-02-101",
qrValue: "B02-101",
productCode: "00345/TC789-12001",
boxType: "LPR",
productName: "液压阀组件",
capacity: "5",
materialWarehouse: "U30567",
productionWarehouse: "131045",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "液压科技",
applicableModels: ["U30全系", "RX305", "RX306", "RDL系列"],
usageQuantities: ["1", "1", "2", "1"]
},
{
name: "C区-03-205",
qrValue: "C03-205",
productCode: "00456/MK321-04511",
boxType: "MCT",
productName: "控制模块V3",
capacity: "10",
materialWarehouse: "U40899",
productionWarehouse: "141202",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "电子创新",
applicableModels: ["U20全系", "RX全系", "RDL全系", "EX系列"],
usageQuantities: ["1", "1", "1", "―"]
},
{
name: "D区-04-301",
qrValue: "D04-301",
productCode: "00567/PT456-78900",
boxType: "HVB",
productName: "高压油管组件",
capacity: "8",
materialWarehouse: "U50123",
productionWarehouse: "151078",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "液压管道",
applicableModels: ["U35动臂", "U40斗杆", "RX307", "EX45"],
usageQuantities: ["2", "1", "1", "1"]
},
{
name: "E区-05-122",
qrValue: "E05-122",
productCode: "00678/BD123-45678",
boxType: "FGP",
productName: "履带板组件",
capacity: "4",
materialWarehouse: "U60789",
productionWarehouse: "161234",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "机械制造",
applicableModels: ["U35全系", "U40全系", "RX308", "EX60"],
usageQuantities: ["4", "4", "2", "2"]
},
{
name: "A区-01-001",
qrValue: "A01-001",
productCode: "00221/RE556-06022",
boxType: "SPT",
productName: "侧板LB-2",
capacity: "20",
materialWarehouse: "U20101",
productionWarehouse: "121012",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "A区-01-002",
qrValue: "A01-002",
productCode: "00221/RE556-06023",
boxType: "SPT",
productName: "侧板RB-2",
capacity: "20",
materialWarehouse: "U20102",
productionWarehouse: "121013",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "B区-02-101",
qrValue: "B02-101",
productCode: "00345/TC789-12001",
boxType: "LPR",
productName: "液压阀组件",
capacity: "5",
materialWarehouse: "U30567",
productionWarehouse: "131045",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "液压科技",
applicableModels: ["U30全系", "RX305", "RX306", "RDL系列"],
usageQuantities: ["1", "1", "2", "1"]
},
{
name: "C区-03-205",
qrValue: "C03-205",
productCode: "00456/MK321-04511",
boxType: "MCT",
productName: "控制模块V3",
capacity: "10",
materialWarehouse: "U40899",
productionWarehouse: "141202",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "电子创新",
applicableModels: ["U20全系", "RX全系", "RDL全系", "EX系列"],
usageQuantities: ["1", "1", "1", "―"]
},
{
name: "D区-04-301",
qrValue: "D04-301",
productCode: "00567/PT456-78900",
boxType: "HVB",
productName: "高压油管组件",
capacity: "8",
materialWarehouse: "U50123",
productionWarehouse: "151078",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "液压管道",
applicableModels: ["U35动臂", "U40斗杆", "RX307", "EX45"],
usageQuantities: ["2", "1", "1", "1"]
},
{
name: "E区-05-122",
qrValue: "E05-122",
productCode: "00678/BD123-45678",
boxType: "FGP",
productName: "履带板组件",
capacity: "4",
materialWarehouse: "U60789",
productionWarehouse: "161234",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "机械制造",
applicableModels: ["U35全系", "U40全系", "RX308", "EX60"],
usageQuantities: ["4", "4", "2", "2"]
},
{
name: "A区-01-001",
qrValue: "A01-001",
productCode: "00221/RE556-06022",
boxType: "SPT",
productName: "侧板LB-2",
capacity: "20",
materialWarehouse: "U20101",
productionWarehouse: "121012",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "A区-01-002",
qrValue: "A01-002",
productCode: "00221/RE556-06023",
boxType: "SPT",
productName: "侧板RB-2",
capacity: "20",
materialWarehouse: "U20102",
productionWarehouse: "121013",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "B区-02-101",
qrValue: "B02-101",
productCode: "00345/TC789-12001",
boxType: "LPR",
productName: "液压阀组件",
capacity: "5",
materialWarehouse: "U30567",
productionWarehouse: "131045",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "液压科技",
applicableModels: ["U30全系", "RX305", "RX306", "RDL系列"],
usageQuantities: ["1", "1", "2", "1"]
},
{
name: "C区-03-205",
qrValue: "C03-205",
productCode: "00456/MK321-04511",
boxType: "MCT",
productName: "控制模块V3",
capacity: "10",
materialWarehouse: "U40899",
productionWarehouse: "141202",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "电子创新",
applicableModels: ["U20全系", "RX全系", "RDL全系", "EX系列"],
usageQuantities: ["1", "1", "1", "―"]
},
{
name: "D区-04-301",
qrValue: "D04-301",
productCode: "00567/PT456-78900",
boxType: "HVB",
productName: "高压油管组件",
capacity: "8",
materialWarehouse: "U50123",
productionWarehouse: "151078",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "液压管道",
applicableModels: ["U35动臂", "U40斗杆", "RX307", "EX45"],
usageQuantities: ["2", "1", "1", "1"]
},
{
name: "E区-05-122",
qrValue: "E05-122",
productCode: "00678/BD123-45678",
boxType: "FGP",
productName: "履带板组件",
capacity: "4",
materialWarehouse: "U60789",
productionWarehouse: "161234",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "机械制造",
applicableModels: ["U35全系", "U40全系", "RX308", "EX60"],
usageQuantities: ["4", "4", "2", "2"]
},
{
name: "A区-01-001",
qrValue: "A01-001",
productCode: "00221/RE556-06022",
boxType: "SPT",
productName: "侧板LB-2",
capacity: "20",
materialWarehouse: "U20101",
productionWarehouse: "121012",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "A区-01-002",
qrValue: "A01-002",
productCode: "00221/RE556-06023",
boxType: "SPT",
productName: "侧板RB-2",
capacity: "20",
materialWarehouse: "U20102",
productionWarehouse: "121013",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "B区-02-101",
qrValue: "B02-101",
productCode: "00345/TC789-12001",
boxType: "LPR",
productName: "液压阀组件",
capacity: "5",
materialWarehouse: "U30567",
productionWarehouse: "131045",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "液压科技",
applicableModels: ["U30全系", "RX305", "RX306", "RDL系列"],
usageQuantities: ["1", "1", "2", "1"]
},
{
name: "C区-03-205",
qrValue: "C03-205",
productCode: "00456/MK321-04511",
boxType: "MCT",
productName: "控制模块V3",
capacity: "10",
materialWarehouse: "U40899",
productionWarehouse: "141202",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "电子创新",
applicableModels: ["U20全系", "RX全系", "RDL全系", "EX系列"],
usageQuantities: ["1", "1", "1", "―"]
},
{
name: "D区-04-301",
qrValue: "D04-301",
productCode: "00567/PT456-78900",
boxType: "HVB",
productName: "高压油管组件",
capacity: "8",
materialWarehouse: "U50123",
productionWarehouse: "151078",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "液压管道",
applicableModels: ["U35动臂", "U40斗杆", "RX307", "EX45"],
usageQuantities: ["2", "1", "1", "1"]
},
{
name: "E区-05-122",
qrValue: "E05-122",
productCode: "00678/BD123-45678",
boxType: "FGP",
productName: "履带板组件",
capacity: "4",
materialWarehouse: "U60789",
productionWarehouse: "161234",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "机械制造",
applicableModels: ["U35全系", "U40全系", "RX308", "EX60"],
usageQuantities: ["4", "4", "2", "2"]
},
{
name: "A区-01-001",
qrValue: "A01-001",
productCode: "00221/RE556-06022",
boxType: "SPT",
productName: "侧板LB-2",
capacity: "20",
materialWarehouse: "U20101",
productionWarehouse: "121012",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "A区-01-002",
qrValue: "A01-002",
productCode: "00221/RE556-06023",
boxType: "SPT",
productName: "侧板RB-2",
capacity: "20",
materialWarehouse: "U20102",
productionWarehouse: "121013",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "固兰特",
applicableModels: ["U20动臂", "U20斗杆", "U20上", "RX306上"],
usageQuantities: ["1", "―", "―", "―"]
},
{
name: "B区-02-101",
qrValue: "B02-101",
productCode: "00345/TC789-12001",
boxType: "LPR",
productName: "液压阀组件",
capacity: "5",
materialWarehouse: "U30567",
productionWarehouse: "131045",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "液压科技",
applicableModels: ["U30全系", "RX305", "RX306", "RDL系列"],
usageQuantities: ["1", "1", "2", "1"]
},
{
name: "C区-03-205",
qrValue: "C03-205",
productCode: "00456/MK321-04511",
boxType: "MCT",
productName: "控制模块V3",
capacity: "10",
materialWarehouse: "U40899",
productionWarehouse: "141202",
taxCategory: "U20101;121012-00221;RE556-06022;课", supplier: "电子创新",
applicableModels: ["U20全系", "RX全系", "RDL全系", "EX系列"],
usageQuantities: ["1", "1", "1", "―"]
},
{
name: "D区-04-301",
qrValue: "D04-301",
productCode: "00567/PT456-78900",
boxType: "HVB",
productName: "高压油管组件",
capacity: "8",
materialWarehouse: "U50123",
productionWarehouse: "151078",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "液压管道",
applicableModels: ["U35动臂", "U40斗杆", "RX307", "EX45"],
usageQuantities: ["2", "1", "1", "1"]
},
{
name: "E区-05-122",
qrValue: "E05-122",
productCode: "00678/BD123-45678",
boxType: "FGP",
productName: "履带板组件",
capacity: "4",
materialWarehouse: "U60789",
productionWarehouse: "161234",
taxCategory: "U20101;121012-00221;RE556-06022;课",
supplier: "机械制造",
applicableModels: ["U35全系", "U40全系", "RX308", "EX60"],
usageQuantities: ["4", "4", "2", "2"]
}
]
locations: [ ],
groups:[]
}
},
mounted() {
this.getPrintList();
},
methods: {
getQrContent(location) {
//
return `${location.taxCategory}`;
return `${location.ewm}`;
//
// return location.boxType;
@ -699,6 +130,18 @@ export default {
preview: true,//
paperSize: 'A5'
});
},
getPrintList(){
bomPrintBiaoQianList().then(res => {
console.log(res)
this.locations = res;
this.groups=[]
for (let i = 0; i < this.locations.length; i += 3) {
this.groups.push(this.locations.slice(i, i + 3));
}
console.log(this.groups)
});
}
}

View File

@ -40,21 +40,6 @@
:value="item.value"
/>
</el-select>
<el-select
v-model="query.beFz"
clearable
size="small"
placeholder="是否复制"
class="filter-item"
style="width: 150px"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.boolean_status"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-input v-model="query.ddbh" clearable placeholder="订单编号" style="width: 185px;" class="filter-item"
@ -93,9 +78,9 @@
@click="collectFromFlag = true"
icon="el-icon-document-add"
>
二维码采集
二维码上架
</el-button>
<el-button
<!-- <el-button
slot="right"
v-permission="permission.xppLyOut"
class="filter-item"
@ -150,17 +135,6 @@
>
取消收货
</el-button>
<el-button
slot="right"
v-permission="permission.cancelPut"
class="filter-item"
type="primary"
size="mini"
:disabled="crud.selections.length <= 0"
@click="cancelPutM(crud.selections)"
>
取消上架
</el-button>
<el-button
slot="right"
v-permission="permission.cancelPut"
@ -172,17 +146,7 @@
>
调整出库
</el-button>
<el-button
slot="right"
v-permission="permission.showXppBd"
class="filter-item"
type="primary"
size="mini"
:disabled="crud.selections.length != 1"
@click="showXppBd(crud.selections[0])"
>
现品票补打
</el-button>
<el-button
slot="right"
v-permission="permission.createReceiptBtn"
@ -217,6 +181,32 @@
>
打印收货清单
</el-button>
-->
<el-button
slot="right"
v-permission="permission.cancelPut"
class="filter-item"
type="primary"
size="mini"
:disabled="crud.selections.length <= 0"
@click="cancelPutM(crud.selections)"
>
取消上架
</el-button>
<el-button
slot="right"
v-permission="permission.showXppBd"
class="filter-item"
type="primary"
size="mini"
:disabled="crud.selections.length != 1"
@click="showXppBd(crud.selections[0])"
>
现品票补打
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog
@ -234,16 +224,27 @@
<el-button type="primary" @click="xpplyBFM(crud.selections)"> </el-button>
</span>
</el-dialog>
<!-- 二维码采集-->
<el-dialog title="现品票采集" :visible.sync="collectFromFlag" width="400px">
<!-- 二维码采集上架-->
<el-dialog title="现品票采集上架" :visible.sync="collectFromFlag" width="400px">
<el-form ref="collectFrom" :model="collectFrom" :rules="rules" size="small" label-width="80px">
<el-form-item label="二维码" prop="ewm">
<el-form-item label="现品票" prop="ewm">
<el-input v-model="collectFrom.ewm" :rows="3" type="textarea" style="width: 270px;"/>
</el-form-item>
<el-form-item label="库位" prop="stock">
<el-select v-model="collectFrom.point" value-key="id" filterable placeholder="请选择库位"
style="width: 200px;">
<el-option
v-for="item in pointList"
:key="item.id"
:label="item.code"
:value="item"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="collectFromFlag= false"> </el-button>
<el-button type="primary" @click="collectFromPass"> </el-button>
<el-button type="primary" @click="collectPutAway"> </el-button>
</div>
</el-dialog>
@ -281,8 +282,8 @@
style="width: 100%;" @selection-change="crud.selectionChangeHandler" border
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="id" label="序号" width="80px"/>
<el-table-column prop="receipt_code" label="收货清单号" width="120px"/>
<el-table-column prop="id" label="序号" width="100px"/>
<el-table-column prop="receipt_code" label="收货清单号" width="120px" v-if="false"/>
<el-table-column prop="rela_supplier" label="供应商" width="180"/>
<el-table-column prop="item_code" label="品番" width="100px">
</el-table-column>
@ -297,7 +298,7 @@
<el-table-column prop="ddbh" label="订单编号"/>
<el-table-column prop="fzh" label="分支号" width="60px"/>
<el-table-column prop="prop_c1" label="批次号" width="100px"/>
<el-table-column prop="boolean_status#be_fz" label="是否复制">
<el-table-column prop="boolean_status#be_fz" label="是否复制" v-if="false">
<template slot-scope="scope">
{{ dict.label.boolean_status[scope.row.be_fz] }}
</template>
@ -327,15 +328,15 @@
<el-table-column prop="zzkw" label="投料库位" width="80" align="center"/>
<el-table-column prop="ewm" :show-overflow-tooltip="true" label="现品票"/>
<el-table-column prop="description" label="描述"/>
<el-table-column prop="boolean_status#tf_ly" label="是否留样">
<el-table-column prop="boolean_status#tf_ly" label="是否留样" v-if="false">
<template slot-scope="scope">
{{ dict.label.boolean_status[scope.row.tf_ly] }}
</template>
</el-table-column>
<el-table-column prop="ly_code" label="留样单号" width="120px"/>
<el-table-column prop="ly_data" label="留样日期" width="150px"/>
<el-table-column prop="count_code" label="盘点单号" width="120px"/>
<el-table-column prop="hy_data" label="还样日期" width="150px"/>
<el-table-column prop="ly_code" label="留样单号" width="120px" v-if="false"/>
<el-table-column prop="ly_data" label="留样日期" width="150px" v-if="false"/>
<el-table-column prop="count_code" label="盘点单号" width="120px" v-if="false"/>
<el-table-column prop="hy_data" label="还样日期" width="150px" v-if="false"/>
</el-table>
</div>
<div style="float: right;">
@ -365,6 +366,7 @@ import DonMessage from '@/utils/message'
import { formatDate } from '@/utils/commonUtils'
import DateRangePicker from "@/components/DateRangePicker/index.vue";
import {mapGetters} from "vuex";
import {queryPointList} from "@/api/point";
const defaultForm = {
tfLy:null,
@ -438,7 +440,8 @@ export default {
data() {
return {
collectFromFlag: false,
collectFrom: { ewm: null },
collectFrom: { ewm: null,point:null },
pointList: [],
permission: {
add: ['admin', 'xppRecord:add'],
edit: ['admin', 'xppRecord:edit'],
@ -481,6 +484,9 @@ export default {
'user'
])
},
mounted() {
this.getPointList();
},
methods: {
// false
[CRUD.HOOK.beforeRefresh]() {
@ -494,8 +500,13 @@ export default {
// const day = date.getDate().toString().padStart(2, '0')
// return `${year}-${month}-${day}`;
},
collectFromPass() {
crudXppRecord.collectFromPass(this.collectFrom).then(res => {
collectPutAway() {
console.log(this.collectFrom)
let date_ = {ewm: null, pointId: null};
date_.ewm = this.collectFrom.ewm;
date_.pointId = this.collectFrom.point.id;
console.log(date_)
crudAsnDetail.collectPutAway(date_).then(res => {
if (res.status == 200) {
this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
}
@ -515,6 +526,16 @@ export default {
getFormatDate(data) {
return formatDate(data)
},
getPointList() {
queryPointList({"type":"CH"}).then(res => {
this.pointList = res.map(function (obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
})
},
//
xppLyOutM(data) {
let list = []

View File

@ -38,9 +38,9 @@
style="width: 370px;"
/>
</el-form-item>
<el-form-item label="收货清单描述" prop="remark">
<!-- <el-form-item label="收货清单描述" prop="remark">
<el-input v-model="form.remark" style="width: 370px;" />
</el-form-item>
</el-form-item>-->
<el-form-item label="顶级仓库">
<el-radio-group v-model="form.isTop" style="width: 140px">
<el-radio label="1"></el-radio>