Yangwl
/
lanju-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
Yangwl 3 months ago
parent 51b7dd754a 04542c1b34
commit f505137df7
6 changed files with 173 additions and 123 deletions
Show Stats Download Patch File Download Diff File

8
src/api/wms/matetowsn.js
Unescape Escape View File

@ -8,6 +8,14 @@ export function listMatetowsn(query) {
params: query params: query
}); });
} }
export function listsaplist(query) {
return request({
url: '/wms/matetowsn/saplist',
method: 'get',
params: query
});
}
export function cardDy(data) { export function cardDy(data) {
return request({ return request({
url: '/wms/matetowsn/cardDy', url: '/wms/matetowsn/cardDy',

22
src/api/wms/outorderfc.js
Unescape Escape View File

@ -24,6 +24,14 @@ export function listOutorderZC(query) {
params: query params: query
}); });
} }
// 查询包材出库单列表去除反冲的
export function listOutorderZCTC(query) {
return request({
url: '/wms/outorder/listZCTC',
method: 'post',
params: query
});
}
// 查询包材出库单详细 // 查询包材出库单详细
export function getOutorder(ID) { export function getOutorder(ID) {
return request({ return request({
@ -65,6 +73,13 @@ export function delOutorder(ID) {
method: 'delete' method: 'delete'
}); });
} }
export function removeReturn(data) {
return request({
url: '/wms/outorder/removeReturn',
method: 'post',
data: data
});
}
// 仓库列表 // 仓库列表
export function getlistCK(data) { export function getlistCK(data) {
return request({ return request({
@ -112,6 +127,13 @@ export function OutboundPostingzcSAP(data) {
data: data data: data
}); });
} }
export function OutboundPostingzcSAPTH(data) {
return request({
url: '/wms/outorder/OutboundPostingzcSAPTH',
method: 'post',
data: data
});
}
export function OutboundPostingzcSAPTS(data) { export function OutboundPostingzcSAPTS(data) {
return request({ return request({
url: '/wms/order/OutboundPostingzcSAPTS', url: '/wms/order/OutboundPostingzcSAPTS',

193
src/views/wms/matetowsnsap/index.vue
Unescape Escape View File

@ -19,41 +19,35 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="批次" prop="userDefined2"> <el-form-item label="物料号" prop="matnr">
<el-input <el-input
v-model="queryParams.userDefined2" v-model="queryParams.matnr"
placeholder="请输入仓库"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库" prop="whCode">
<el-input
v-model="queryParams.whCode"
placeholder="请输入仓库"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库区" prop="waCode">
<el-input
v-model="queryParams.waCode"
placeholder="请输入库区"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料号" prop="materialCode">
<el-input
v-model="queryParams.materialCode"
placeholder="请输入物料号" placeholder="请输入物料号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料描述" prop="materialDesc"> <el-form-item label="批次" prop="charg">
<el-input <el-input
v-model="queryParams.materialDesc" v-model="queryParams.charg"
placeholder="请输入批次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存地点" prop="lgort">
<el-input
v-model="queryParams.lgort"
placeholder="请输入库存地点"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料描述" prop="maktx">
<el-input
v-model="queryParams.maktx"
placeholder="请输入物料描述" placeholder="请输入物料描述"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -103,39 +97,35 @@
:summary-align="'center'" :summary-align="'center'"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="唯一序列号" align="center" prop="mateOrderInSnId" v-if="false" /> <el-table-column label="唯一序列号" align="center" prop="storageId" v-if="false" />
<el-table-column label="送货时间" align="center" prop="gmtCreate" width="100"> <!-- <el-table-column label="送货时间" align="center" prop="gmtCreate" width="100">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span> <!-- <span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="物料号" align="center" prop="materialCode" width="120"> <el-table-column label="物料号" align="center" prop="matnr" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ formatProductCode(scope.row.materialCode) }}</span> <span>{{ formatProductCode(scope.row.matnr) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料描述" align="center" prop="materialDesc" width="300"/> <el-table-column label="物料描述" align="center" prop="maktx" width="120"/>
<el-table-column label="送货单" align="center" prop="poNo" width="100"/> <el-table-column label="工厂" align="center" prop="werks" width="80"/>
<el-table-column label="采购单" align="center" prop="orderNo" width="100"/> <el-table-column label="库存地点" align="center" prop="lgort" width="80"/>
<el-table-column label="批次" align="center" prop="userDefined2" width="100"/> <el-table-column label="批号" align="center" prop="charg" width="120"/>
<el-table-column label="入库数量" align="center" prop="amount" />
<el-table-column label="出库数量" align="center" prop="outNumber" /> <el-table-column label="物料组" align="center" prop="matkl" width="80"/>
<el-table-column label="剩余数量" align="center"> <el-table-column label="单位" align="center" prop="meins" width="80"/>
<template slot-scope="scope">
<span>{{ scope.row.amount - (scope.row.outNumber || 0) }}</span> <el-table-column label="非限制库存" align="center" prop="clabs" width="120"/>
</template> <el-table-column label="质检库存" align="center" prop="cinsm" width="120"/>
</el-table-column> lgort
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="限制库存" align="center" prop="ceinm" width="120" />
<template slot-scope="scope"> <el-table-column label="冻结库存" align="center" prop="cspem" width="120" />
<span v-if="scope.row.outNumber === 0 || scope.row.outNumber === null">入库</span>
<span v-else-if="scope.row.amount - scope.row.outNumber > 0 && (scope.row.outNumber !== 0 && scope.row.outNumber !== null)">部分出库</span>
<span v-else>出库完成</span> <!-- <el-table-column label="仓库" align="center" prop="whCode" />-->
</template> <!-- <el-table-column label="库区" align="center" prop="waCode" />-->
</el-table-column>
<el-table-column label="标识卡" align="center" prop="wlCode" width="300"/>
<el-table-column label="仓库" align="center" prop="whCode" />
<el-table-column label="库区" align="center" prop="waCode" />
<el-table-column label="备用1" align="center" prop="userDefined1" v-if="false" /> <el-table-column label="备用1" align="center" prop="userDefined1" v-if="false" />
<el-table-column label="备用2" align="center" prop="userDefined2" v-if="false" /> <el-table-column label="备用2" align="center" prop="userDefined2" v-if="false" />
<el-table-column label="备用3" align="center" prop="userDefined3" v-if="false" /> <el-table-column label="备用3" align="center" prop="userDefined3" v-if="false" />
@ -146,11 +136,11 @@
<el-table-column label="备用8" align="center" prop="userDefined8" v-if="false" /> <el-table-column label="备用8" align="center" prop="userDefined8" v-if="false" />
<el-table-column label="备用9" align="center" prop="userDefined9" v-if="false" /> <el-table-column label="备用9" align="center" prop="userDefined9" v-if="false" />
<el-table-column label="备用10" align="center" prop="userDefined10" v-if="false" /> <el-table-column label="备用10" align="center" prop="userDefined10" v-if="false" />
<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180"> <!-- <el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span> <!-- <span>{{ parseTime(scope.row.gmtCreate, '{y}-{m}-{d}') }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="有效标记" align="center" prop="activeFlag"v-if="false" /> <el-table-column label="有效标记" align="center" prop="activeFlag"v-if="false" />
<el-table-column label="工厂号" align="center" prop="factoryCode" /> <el-table-column label="工厂号" align="center" prop="factoryCode" />
</el-table> </el-table>
@ -310,10 +300,10 @@
<el-table :data="addoutorderList" @selection-change="handleSelectionChange1"> <el-table :data="addoutorderList" @selection-change="handleSelectionChange1">
<el-table-column type="selection" width="55" align="center" :index="indexMethod" /> <el-table-column type="selection" width="55" align="center" :index="indexMethod" />
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="物料描述" align="center" prop="materialDesc" width="255"/> <el-table-column label="物料描述" align="center" prop="maktx" width="255"/>
<el-table-column label="物料编码" align="center" prop="materialCode" width="150"> <el-table-column label="物料编码" align="center" prop="matnr" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ formatProductCode(scope.row.materialCode) }}</span> <span>{{ formatProductCode(scope.row.matnr) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单位" align="center" prop="userDefined1" /> <el-table-column label="单位" align="center" prop="userDefined1" />
@ -345,7 +335,7 @@
<!-- 查询条件 --> <!-- 查询条件 -->
<el-form :inline="true" :model="queryParams" class="demo-form-inline"> <el-form :inline="true" :model="queryParams" class="demo-form-inline">
<el-form-item label="物料号"> <el-form-item label="物料号">
<el-input v-model="queryParams.materialCode" placeholder="请输入物料号"></el-input> <el-input v-model="queryParams.matnr" placeholder="请输入物料号"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="fetchMaterials">查询</el-button> <el-button type="primary" @click="fetchMaterials">查询</el-button>
@ -354,10 +344,10 @@
<el-table :data="materialList" @selection-change="handleMaterialSelectionChange"> <el-table :data="materialList" @selection-change="handleMaterialSelectionChange">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="ID" align="center" prop="ID" v-if="false" /> <el-table-column label="ID" align="center" prop="ID" v-if="false" />
<el-table-column label="物料描述" prop="materialDesc" width="250"/> <el-table-column label="物料描述" prop="maktx" width="250"/>
<el-table-column label="物料编码" align="center" prop="materialCode" width="150"> <el-table-column label="物料编码" align="center" prop="matnr" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ formatProductCode(scope.row.materialCode) }}</span> <span>{{ formatProductCode(scope.row.matnr) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单位" prop="userDefined1" width="100"/> <el-table-column label="单位" prop="userDefined1" width="100"/>
@ -385,7 +375,7 @@
</template> </template>
<script> <script>
import { listMatetowsn,cardDy, cardBD,Removecard,getMatetowsn, delMatetowsn, addMatetowsn, updateMatetowsn } from "@/api/wms/matetowsn"; import { listMatetowsn,listsaplist,cardDy, cardBD,Removecard,getMatetowsn, delMatetowsn, addMatetowsn, updateMatetowsn } from "@/api/wms/matetowsn";
import { import {
listOutorder, listOutorder,
getOutorder, getOutorder,
@ -446,23 +436,25 @@ export default {
productionDate: '', // 生产日期 productionDate: '', // 生产日期
shelfLifeExpiryDate: '' ,// 货架寿命到期日 shelfLifeExpiryDate: '' ,// 货架寿命到期日
planDateMin: '', planDateMin: '',
materialCode:'', matnr:'',
costCenter: '' // 新增成本中心字段 costCenter: '' // 新增成本中心字段
}, },
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
whCode: null, whCode: null,
lgort:null,
waCode: null, waCode: null,
wlCode: null, wlCode: null,
orderNo: null, meins: null,
poNo: null, matkl: null,
poLine: null, poLine: null,
materialCode: null, matnr: null,
materialDesc: null, maktx: null,
sn: null, sn: null,
barCode: null, barCode: null,
amount: null, amount: null,
charg: null,
userDefined1: null, userDefined1: null,
userDefined2: null, userDefined2: null,
userDefined3: null, userDefined3: null,
@ -495,7 +487,7 @@ export default {
/** 查询包材库存明细表列表 */ /** 查询包材库存明细表列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listMatetowsn(this.queryParams).then(response => { listsaplist(this.queryParams).then(response => {
this.matetowsnList = response.rows; this.matetowsnList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -512,7 +504,7 @@ export default {
/** 过账按钮操作 */ /** 过账按钮操作 */
handleUpdate(row) { handleUpdate(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
let postData = this.ids.map(id => ({ mateOrderInSnId: id })); let postData = this.ids.map(id => ({ storageId: id }));
console.log(postData) console.log(postData)
this.$modal.confirm('是否进行打印').then(function() { this.$modal.confirm('是否进行打印').then(function() {
return cardDy(JSON.stringify(postData)); return cardDy(JSON.stringify(postData));
@ -536,16 +528,19 @@ export default {
// }, // },
getSummary(param) { getSummary(param) {
const { columns, data } = param; const { columns, data } = param;
const totalAmount = data.reduce((sum, row) => sum + (row.amount || 0), 0); const totalAmount = data.reduce((sum, row) => sum + (Number(row.clabs) || 0), 0);
const totalOutNumber = data.reduce((sum, row) => sum + (row.outNumber || 0), 0); const totalOutNumber = data.reduce((sum, row) => sum + (Number(row.cinsm) || 0), 0);
const totalRemaining = totalAmount - totalOutNumber; const totalRemaining = data.reduce((sum, row) => sum + (Number(row.ceinm) || 0), 0);
const totalRemacspem = data.reduce((sum, row) => sum + (Number(row.cspem) || 0), 0);
const summary = columns.map((column, index) => { const summary = columns.map((column, index) => {
if (index === 7) { // "计划数量"在第8列 if (index === 8) { // "计划数量"在第8列
return totalAmount; return totalAmount;
} else if (index === 8) { // "已入库数量"在第9列 } else if (index === 9) { // "已入库数量"在第9列
return totalOutNumber; return totalOutNumber;
}else if (index === 9) { // "已入库数量"在第9列 }else if (index === 10) { // "已入库数量"在第9列
return totalRemaining; return totalRemaining;
}else if (index === 11) { // "已入库数量"在第9列
return totalRemacspem;
} }
return ''; // 其余列不汇总，返回空 return ''; // 其余列不汇总，返回空
}); });
@ -596,7 +591,7 @@ export default {
for (const material of this.selectedMaterials) { for (const material of this.selectedMaterials) {
let queryParams = { let queryParams = {
produceCode: material.produceCode, produceCode: material.produceCode,
materialCode: material.materialCode matnr: material.matnr
}; };
try { try {
@ -607,9 +602,9 @@ export default {
materialsToAdd.push({ materialsToAdd.push({
produceCode: material.produceCode, produceCode: material.produceCode,
materialDesc: material.materialDesc, maktx: material.maktx,
userDefined1: material.userDefined1, userDefined1: material.userDefined1,
materialCode: material.materialCode, matnr: material.matnr,
planNumber: material.planNumber, // 数量 planNumber: material.planNumber, // 数量
outNumber: material.outNumber, // 出库数量 outNumber: material.outNumber, // 出库数量
bgnumber: material.bgnumber, // 报工数量 bgnumber: material.bgnumber, // 报工数量
@ -628,7 +623,7 @@ export default {
}, },
handleRemoveBatch() { handleRemoveBatch() {
const ids = this.ids; const ids = this.ids;
let postData = this.ids.map(id => ({ mateOrderInSnId: id })); let postData = this.ids.map(id => ({ storageId: id }));
console.log(postData) console.log(postData)
this.$modal.confirm('是否确认删除标识卡编号为"' + wlCode + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除标识卡编号为"' + wlCode + '"的数据项？').then(function() {
return Removecard(postData); return Removecard(postData);
@ -665,15 +660,15 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
mateOrderInSnId: null, storageId: null,
whCode: null, lgort: null,
waCode: null, waCode: null,
wlCode: null, wlCode: null,
orderNo: null, meins: null,
poNo: null, matkl: null,
poLine: null, poLine: null,
materialCode: null, matnr: null,
materialDesc: null, maktx: null,
sn: null, sn: null,
barCode: null, barCode: null,
amount: null, amount: null,
@ -709,7 +704,7 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.mateOrderInSnId) this.ids = selection.map(item => item.storageId)
this.single = selection.length!==1 this.single = selection.length!==1
this.multiple = !selection.length this.multiple = !selection.length
}, },
@ -741,8 +736,8 @@ export default {
qty: item.qty, // 计划数量 qty: item.qty, // 计划数量
userDefined6: this.selectedOrderType, // 订单类型 userDefined6: this.selectedOrderType, // 订单类型
produceCode: item.produceCode, // 生产代码 produceCode: item.produceCode, // 生产代码
materialDesc: item.materialDesc, // 物料描述 maktx: item.maktx, // 物料描述
materialCode: item.materialCode, // 物料编码 matnr: item.matnr, // 物料编码
unit: item.userDefined1, unit: item.userDefined1,
// 注意：根据您的描述，可能没有 unit 字段，请确认是否需要 // 注意：根据您的描述，可能没有 unit 字段，请确认是否需要
// unit: item.unit, // unit: item.unit,
@ -782,9 +777,9 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const mateOrderInSnIds = row.mateOrderInSnId || this.ids; const storageIds = row.storageId || this.ids;
this.$modal.confirm('是否确认删除包材库存明细表编号为"' + mateOrderInSnIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除包材库存明细表编号为"' + storageIds + '"的数据项？').then(function() {
return delMatetowsn(mateOrderInSnIds); return delMatetowsn(storageIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");

4
src/views/wms/outorderTS/index.vue
Unescape Escape View File

@ -71,8 +71,8 @@
<el-table-column label="状态" align="center" prop="orderStatus"> <el-table-column label="状态" align="center" prop="orderStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.orderStatus === '0'">未进行</span> <span v-if="scope.row.orderStatus === '0'">未进行</span>
<span v-else-if="scope.row.orderStatus === '1'">进行中</span> <span v-else-if="scope.row.orderStatus === '2'">进行中</span>
<span v-else-if="scope.row.orderStatus === '2'">完成</span> <span v-else-if="scope.row.orderStatus === '3'">完成</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="类型" align="center" prop="userDefined6" /> <el-table-column label="类型" align="center" prop="userDefined6" />

12
src/views/wms/outorderzs/index.vue
Unescape Escape View File

@ -48,19 +48,19 @@
<el-table-column label="序号" type="index" v-if="false" /> <el-table-column label="序号" type="index" v-if="false" />
<el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" /> <el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" />
<el-table-column label="ID" align="center" prop="ID" v-if="false" /> <el-table-column label="ID" align="center" prop="ID" v-if="false" />
<el-table-column label="出库单" align="center" prop="userDefined4" width="250"/> <el-table-column label="出库单" align="center" prop="userDefined4" width="150"/>
<el-table-column label="生产订单" align="center" prop="produceCode" width="250"/> <el-table-column label="生产订单" align="center" prop="produceCode" width="150"/>
<el-table-column label="物料编码" align="center" prop="materialCode" width="250"> <el-table-column label="物料编码" align="center" prop="materialCode" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ formatProductCode(scope.row.materialCode) }}</span> <span>{{ formatProductCode(scope.row.materialCode) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名称" align="center" prop="materialDesc" width="250"/> <el-table-column label="物料名称" align="center" prop="materialDesc" width="150"/>
<el-table-column label="单位" align="center" prop="unit" v-if="false" /> <el-table-column label="单位" align="center" prop="unit" v-if="false" />
<el-table-column label="计划数量" align="center" prop="planNumber" /> <el-table-column label="计划数量" align="center" prop="planNumber" />
<el-table-column label="出库数量" align="center" prop="outNumber" /> <el-table-column label="出库数量" align="center" prop="outNumber" />
<el-table-column label="报工数量" align="center" prop="bgnumber" /> <el-table-column label="报工数量" align="center" prop="bgnumber" />
<el-table-column label="需求时间" align="center" prop="planDate" width="250"/> <el-table-column label="需求时间" align="center" prop="planDate" width="150"/>
<!-- <el-table-column label="需求时间" align="center" prop="planDate" width="250"/>--> <!-- <el-table-column label="需求时间" align="center" prop="planDate" width="250"/>-->
<!-- <el-table-column label="仓库编号" align="center" prop="locCode" />--> <!-- <el-table-column label="仓库编号" align="center" prop="locCode" />-->
<!-- <el-table-column label="库位名称" align="center" prop="locDesc" v-if="false" />--> <!-- <el-table-column label="库位名称" align="center" prop="locDesc" v-if="false" />-->
@ -83,7 +83,7 @@
<span v-else-if="scope.row.userDefined10 === '3'">过账失败</span> <span v-else-if="scope.row.userDefined10 === '3'">过账失败</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="过账凭证" align="center" prop="userDefined9" width="250"/> <el-table-column label="过账凭证" align="center" prop="userDefined9" width="150"/>
<el-table-column label="sap订单过账信息" align="center" prop="userDefined11" /> <el-table-column label="sap订单过账信息" align="center" prop="userDefined11" />

59
src/views/wms/returnorderzs/index.vue
Unescape Escape View File

@ -26,9 +26,21 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"-->
<!-- v-hasPermi="['wms:outorder:add']">新增</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" <el-button
v-hasPermi="['wms:outorder:add']">新增</el-button> type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:pro:workorder:remove']"
>删除
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" @click="handleSAP">过账</el-button> <el-button type="success" plain icon="el-icon-edit" size="mini" @click="handleSAP">过账</el-button>
@ -72,11 +84,11 @@
<el-table-column label="序号" type="index" v-if="false" /> <el-table-column label="序号" type="index" v-if="false" />
<el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" /> <el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" />
<el-table-column label="id" align="center" prop="id" v-if="false" /> <el-table-column label="id" align="center" prop="id" v-if="false" />
<el-table-column label="退料单号" align="center" prop="produceCode" width="150"/>
<el-table-column label="退料单号" align="center" prop="produceCode" width="250"/> <el-table-column label="出库单号" align="center" prop="userDefined4" width="150"/>
<el-table-column label="出库单号" align="center" prop="userDefined4" width="250"/> <el-table-column label="生产日期" align="center" prop="needDate" width="150"/>
<el-table-column label="批次" align="center" prop="userDefined5" width="250"/> <el-table-column label="批次" align="center" prop="userDefined5" width="150"/>
<el-table-column label="物料编码" align="center" prop="materialCode" width="250"> <el-table-column label="物料编码" align="center" prop="materialCode" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ formatProductCode(scope.row.materialCode) }}</span> <span>{{ formatProductCode(scope.row.materialCode) }}</span>
</template> </template>
@ -84,7 +96,7 @@
<el-table-column label="物料名称" align="center" prop="materialDesc" width="250"/> <el-table-column label="物料名称" align="center" prop="materialDesc" width="250"/>
<el-table-column label="单位" align="center" prop="unit" v-if="false" /> <el-table-column label="单位" align="center" prop="unit" v-if="false" />
<el-table-column label="计划数量" align="center" prop="planNumber" /> <el-table-column label="计划数量" align="center" prop="planNumber" />
<el-table-column label="退货数量" align="center" prop="outNumber" /> <el-table-column label="退货数量" align="center" prop="returnNumber" />
<!-- <el-table-column label="报工数量" align="center" prop="bgnumber" />--> <!-- <el-table-column label="报工数量" align="center" prop="bgnumber" />-->
<!-- <el-table-column label="需求时间" align="center" prop="planDate" width="250"/>--> <!-- <el-table-column label="需求时间" align="center" prop="planDate" width="250"/>-->
<!-- <el-table-column label="需求时间" align="center" prop="planDate" width="250"/>--> <!-- <el-table-column label="需求时间" align="center" prop="planDate" width="250"/>-->
@ -109,7 +121,7 @@
<span v-else-if="scope.row.userDefined10 === '3'">过账失败</span> <span v-else-if="scope.row.userDefined10 === '3'">过账失败</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="过账凭证" align="center" prop="userDefined9" width="250"/> <el-table-column label="过账凭证" align="center" prop="userDefined9" width="140"/>
<el-table-column label="sap订单过账信息" align="center" prop="userDefined11" /> <el-table-column label="sap订单过账信息" align="center" prop="userDefined11" />
@ -346,9 +358,12 @@ import {
listReturnBC, listReturnBC,
OutboundPostingSAP, OutboundPostingSAP,
OutboundPostingzcSAP, OutboundPostingzcSAP,
OutboundPostingzcSAPTH,
listOutorderZC, listOutorderZC,
listOutorderZCTC,
listreturnderZC, listreturnderZC,
addreturnderZC, addreturnderZC,
removeReturn,
getIdCardListTH, getIdCardListTH,
listReturnDY, listReturnDY,
listOutorderZU listOutorderZU
@ -684,7 +699,7 @@ export default {
async fetchMaterials(pageNum = 1) { // 这里的参数名称为 pageNum async fetchMaterials(pageNum = 1) { // 这里的参数名称为 pageNum
this.loading = true; // 显示加载状态 this.loading = true; // 显示加载状态
try { try {
const response = await listOutorderZC({ const response = await listOutorderZCTC({
...this.queryParams, // 假设 queryParams 包含其他查询条件 ...this.queryParams, // 假设 queryParams 包含其他查询条件
pageNum: pageNum, // 将当前页码传递给后端 pageNum: pageNum, // 将当前页码传递给后端
pageSize: this.pageSize // 确保将每页显示的数量传递给后端 pageSize: this.pageSize // 确保将每页显示的数量传递给后端
@ -769,8 +784,10 @@ export default {
this.printDialogVisible = true; this.printDialogVisible = true;
this.newWorkerLoading = true // 设置加载状态为true，表示正在加载 this.newWorkerLoading = true // 设置加载状态为true，表示正在加载
this.refreshNewWorkerTable = false // 先将refreshProTable设置为false，隐藏表格 this.refreshNewWorkerTable = false // 先将refreshProTable设置为false，隐藏表格
// 根据选中的 IDs 获取数据
const selectedIds = this.ids[0]; // 获取选中的 ID
let queryParams = { let queryParams = {
produceCode: this.outorderList[0].produceCode ID: selectedIds // 根据选中的数据获取多个工单号，可以根据需要调整
}; };
listReturnDY(queryParams).then(response => { listReturnDY(queryParams).then(response => {
this.showWorkorderCode = true; this.showWorkorderCode = true;
@ -798,8 +815,7 @@ export default {
this.printData.produceCode = response.data.produceCode this.printData.produceCode = response.data.produceCode
this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格 this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格
this.newWorkerLoading = false // 设置加载状态为false，表示加载完成 this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
this.generateBarcode(response.data[0].produceCode); //条码 根据工单号生成
this.generateBarcode(this.outorderList[0].produceCode); //条码 根据工单号生成
}) })
}, },
//产品编码格式化 //产品编码格式化
@ -930,14 +946,14 @@ export default {
let postData = this.selectabletrows.map(item => ({ id: item.id })); let postData = this.selectabletrows.map(item => ({ id: item.id }));
//let postData = this.ids.map(id => ({ id: id })); //let postData = this.ids.map(id => ({ id: id }));
console.log(postData) console.log(postData)
OutboundPostingzcSAP(JSON.stringify(postData)).then(response => { OutboundPostingzcSAPTH(JSON.stringify(postData)).then(response => {
this.$modal.msgSuccess("操作完成"); this.$modal.msgSuccess("操作完成");
}); });
}, },
async submitForm() { async submitForm() {
const payload = this.addoutorderList.map(item => ({ const payload = this.addoutorderList.map(item => ({
id: item.id, id: item.id,
qty: item.qty, qty: item.qty,//操作数量
selectedBatch: item.selectedBatch, selectedBatch: item.selectedBatch,
produceCode: item.produceCode, produceCode: item.produceCode,
materialDesc: item.materialDesc, materialDesc: item.materialDesc,
@ -949,6 +965,14 @@ export default {
})); }));
console.log("payload:", payload); // 使用逗号分隔符来打印对象 console.log("payload:", payload); // 使用逗号分隔符来打印对象
// 输入校验：检查所有项目的数量是否大于零
const invalidItems = payload.filter(item => item.qty <= 0);
if (invalidItems.length > 0) {
// 提示用户哪些物料的数量无效
// const invalidMaterialDescs = invalidItems.map(item => item.materialDesc).join(', ');
this.$message.error(`数量必须大于零`);
return; // 终止操作
}
try { try {
await this.$confirm('确认提交退货单吗?', '确认', { await this.$confirm('确认提交退货单吗?', '确认', {
@ -975,8 +999,9 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const IDs = row.ID || this.ids; const IDs = row.ID || this.ids;
this.$modal.confirm('是否确认删除包材出库单编号为"' + IDs + '"的数据项？').then(function () { this.$modal.confirm('是否确认删除退料单编号为"' + IDs + '"的数据项？').then(function () {
return delOutorder(IDs); let paramsJSON = JSON.stringify(IDs); // 将对象转换为JSON字符串
return removeReturn(paramsJSON);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");

Write Preview
Loading…
Cancel
Save