suojin
/
jonhon-mes-PDA
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

镀前出入库问题修改

Browse Source
master
zhangdi 2 weeks ago
parent 1f533c1504
commit a4bc934ba3
3 changed files with 79 additions and 75 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. 11
      api/warehousingIssue.js
  2. 79
      pages/production/warehousing.vue
  3. 64
      pages/production/warehousingIssue.vue

11
api/warehousingIssue.js
Unescape View File

@ -2,21 +2,18 @@ import http from '@/http/api.js'
// 镀前出库 查询数据
const getBeforePlatOutCardNo = (params) => {
return http.request({
url: '/blade-desk//plateAround/getBeforePlatOutCardNo',
url: '/blade-desk/plateAround/getBeforePlatOutCardNo',
method: 'get',
params: params
})
}
// 镀前出库 保存数据
const savePlateFrontEnterIssue = (params) => {
const savePlateFrontEnterIssue = (data) => {
return http.request({
url: '/blade-desk/plateAround/savePlateFrontEnter',
url: '/blade-desk/plateAround/savePlateFrontIssue',
method: 'post',
data: {
...params,
paType:2
}
data:data
})
}

79
pages/production/warehousing.vue
Unescape View File

@ -24,58 +24,45 @@
<t-td>批次号</t-td>
<t-td>{{ prWorkOrder.batchNo }}</t-td>
</t-tr>
<t-tr>
<!-- <t-tr>
<t-td>需求部门</t-td>
<t-td>{{ prWorkOrder.pjYieldOrder.useDept }}</t-td>
</t-tr>
<t-tr>
<t-td>{{ prWorkOrder.useDept }}</t-td>
</t-tr> -->
<!-- <t-tr>
<t-td>零件编码</t-td>
<t-td>{{ prWorkOrder.pjYieldOrder.partCode }}</t-td>
<t-td>{{ prWorkOrder.partCode }}</t-td>
</t-tr>
<t-tr>
<t-td>零件名称</t-td>
<t-td>{{ prWorkOrder.pjYieldOrder.partName }}</t-td>
</t-tr>
<t-td>{{ prWorkOrder.partName }}</t-td>
</t-tr> -->
<t-tr>
<t-td>工序号</t-td>
<t-td>{{ prWorkPlan.orders }}</t-td>
<t-td>{{ prWorkPlan.processCode }}</t-td>
</t-tr>
<t-tr>
<t-td>工序名称</t-td>
<t-td>{{ prWorkOrder.procedureSet.ppsName }}</t-td>
<t-td>{{ prWorkOrder.processName }}</t-td>
</t-tr>
<t-tr>
<t-td>班组/供应商</t-td>
<t-td>{{ makeTeam.tsName || oemCustomer.ocName }}</t-td>
<t-td>{{ prWorkOrder.teamCode || prWorkOrder.ocName }}</t-td>
</t-tr>
<t-tr>
<t-td>入库数量</t-td>
<t-td>{{ prWorkOrder.makeQty }}</t-td>
<t-td>{{ prWorkOrder.inQuantity }}</t-td>
</t-tr>
<t-tr>
<t-td>下序号</t-td>
<t-td>{{ prWorkOrder.nextOrders || "" }}</t-td>
<t-td>{{ prWorkOrder.nextProcessCode || "" }}</t-td>
</t-tr>
<t-tr>
<t-td>下序名称</t-td>
<t-td>{{
(prWorkOrder &&
prWorkOrder.nextProcedureSet &&
prWorkOrder.nextProcedureSet.ppsName) ||
""
}}</t-td>
<t-td>{{ prWorkOrder.nextProcessName }}</t-td>
</t-tr>
<t-tr>
<t-td>下序班组/供应商</t-td>
<t-td>{{
(prWorkOrder &&
prWorkOrder.nextMakeTeam &&
prWorkOrder.nextMakeTeam.tsName) ||
(prWorkOrder &&
prWorkOrder.nextBsOemCustomer &&
prWorkOrder.nextBsOemCustomer.ocName) ||
""
}}</t-td>
<t-td>{{ prWorkOrder.nextTeamCode }}</t-td>
</t-tr>
</t-table>
<view class="buttonBox">
@ -135,15 +122,16 @@ export default {
let data = res.data;
this.value = "";
this.prWorkPlan = data;
this.prWorkOrder = data.prWorkOrder;
console.log(data.prWorkOrder);
this.quantity = data.prWorkOrder.makeQty;
if (!data.oem) {
this.makeTeam = data.makeTeam;
}
if (data.oemCustomer) {
this.oemCustomer = data.oemCustomer;
}
this.prWorkOrder = data;
this.quantity = data.inQuantity;
// if (!data.oem) {
// this.makeTeam = data.makeTeam;
// }
// if (data.oemCustomer) {
// this.oemCustomer = data.oemCustomer;
// }
uni.showToast({
title: "数据获取成功",
});
@ -170,13 +158,24 @@ export default {
// });
},
submitClick() {
this.$u.api.savePlateFrontEnter({}).then((res) => {
let query = [];
query.push({
wpId: this.prWorkPlan.wpId,
tsId: this.prWorkPlan.teamId,
ocId: this.prWorkPlan.ocId ? this.prWorkPlan.ocId : null,
id: this.prWorkPlan.id,
quantity: this.prWorkPlan.inQuantity,
});
console.log(query,'query');
this.$u.api.savePlateFrontEnter(query).then((res) => {
uni.showToast({
title: "入库成功",
});
this.value = "";
this.setData();
});
// this.$ajax.request({
// url: "pdaSave/savePlateFe",
// method: "POST",
@ -197,11 +196,7 @@ export default {
setData() {
this.prWorkPlan = {};
this.prWorkOrder = {
procedureSet: {},
pjYieldOrder: {},
nextProcedureSet: {},
nextMakeTeam: {},
nextBsOemCustomer: {},
};
this.quantity = null;
this.makeTeam = {};

64
pages/production/warehousingIssue.vue
Unescape View File

@ -12,64 +12,64 @@
<t-table style="margin-top: 20rpx">
<t-tr>
<t-td>流程卡号</t-td>
<t-td>{{ prWorkOrder.cardNo }}</t-td>
<t-td>{{ prWorkPlan.cardNo }}</t-td>
</t-tr>
<t-tr>
<t-td>车间订单号</t-td>
<t-td>{{ prWorkOrder.woCode }}</t-td>
<t-td>{{ prWorkPlan.woCode }}</t-td>
</t-tr>
<t-tr>
<t-td>批次号</t-td>
<t-td>{{ prWorkOrder.batchNo }}</t-td>
<t-td>{{ prWorkPlan.batchNo }}</t-td>
</t-tr>
<t-tr>
<!-- <t-tr>
<t-td>需求部门</t-td>
<t-td>{{ prWorkOrder.pjYieldOrder.useDept }}</t-td>
<t-td>{{ prWorkOrder.useDept }}</t-td>
</t-tr>
<t-tr>
<t-td>零件编码</t-td>
<t-td>{{ prWorkOrder.pjYieldOrder.partCode }}</t-td>
<t-td>{{ prWorkOrder.partCode }}</t-td>
</t-tr>
<t-tr>
<t-td>零件名称</t-td>
<t-td>{{ prWorkOrder.pjYieldOrder.partName }}</t-td>
</t-tr>
<t-td>{{ prWorkOrder.partName }}</t-td>
</t-tr> -->
<t-tr>
<t-td>上序号</t-td>
<t-td>{{ prWorkPlan.orders }}</t-td>
<t-td>{{ prWorkOrder.nextProcessCode }}</t-td>
</t-tr>
<t-tr>
<t-td>上序名称</t-td>
<t-td>{{ prWorkPlan.procedureSet.ppsName }}</t-td>
<t-td>{{ prWorkOrder.nextProcessName }}</t-td>
</t-tr>
<t-tr>
<t-td>上序班组/供应商</t-td>
<t-td>{{
prWorkPlan.makeTeam.tsName || prWorkPlan.bsOemCustomer.ocName
prWorkOrder.nextTeamCode || prWorkOrder.ocName
}}</t-td>
</t-tr>
<t-tr>
<t-td>工序号</t-td>
<t-td>{{ prWorkPlan.nextWorkPlan.orders }}</t-td>
<t-td>{{ prWorkOrder.processCode }}</t-td>
</t-tr>
<t-tr>
<t-td>工序名称</t-td>
<t-td>{{ prWorkPlan.nextWorkPlan.procedureSet.ppsName }}</t-td>
<t-td>{{ prWorkOrder.processName }}</t-td>
</t-tr>
<t-tr>
<t-td>班组/供应商</t-td>
<t-td>{{ makeTeam.tsName || oemCustomer.ocName }}</t-td>
<t-td>{{ prWorkOrder.teamCode || prWorkOrder.ocName }}</t-td>
</t-tr>
<t-tr>
<t-td>出库数量</t-td>
<t-td>{{ prWorkOrder.makeQty }}</t-td>
<t-td>{{ prWorkOrder.inQuantity }}</t-td>
</t-tr>
</t-table>
<view class="buttonBox"
><button
class="button"
type="primary"
:disabled="!(Object.keys(this.prWorkOrder.pjYieldOrder).length > 0)"
:disabled="!(Object.keys(this.prWorkOrder).length > 0)"
@click="submitClick"
>
出库
@ -121,17 +121,18 @@ export default {
this.value = code;
this.$u.api.getBeforePlatOutCardNo({ cardNo: code }).then((res) => {
let data = res.data;
console.log(data,'8787878878');
this.value = "";
this.prPlateAround = data;
this.prWorkPlan = data.prWorkPlan;
this.prWorkOrder = data.prWorkPlan.prWorkOrder;
this.quantity = data.prWorkPlan.quantity;
if (!data.prWorkPlan.oem) {
this.makeTeam = data.prWorkPlan.makeTeam;
}
if (data.oemCustomer) {
this.oemCustomer = data.prWorkPlan.oemCustomer;
}
this.prWorkPlan = data;
this.prWorkOrder = data;
this.quantity = data.inQuantity;
// if (!data.prWorkPlan.oem) {
// this.makeTeam = data.prWorkPlan.makeTeam;
// }
// if (data.oemCustomer) {
// this.oemCustomer = data.prWorkPlan.oemCustomer;
// }
uni.showToast({
title: "数据获取成功",
});
@ -158,13 +159,24 @@ export default {
// });
},
submitClick() {
this.$u.api.savePlateFrontEnterIssue(this.prPlateAround).then((res) => {
let query = [];
query.push({
wpId: this.prWorkPlan.wpId,
tsId: this.prWorkPlan.teamId,
ocId: this.prWorkPlan.ocId ? this.prWorkPlan.ocId : null,
id: this.prWorkPlan.id,
quantity: this.prWorkPlan.inQuantity,
});
console.log(query,'query');
this.$u.api.savePlateFrontEnterIssue(query).then((res) => {
uni.showToast({
title: "出库成功",
});
this.value = "";
this.setData();
});
// this.$ajax.request({
// url: 'pdaSave/savePlateFi',
// method: 'POST',

Write Preview
Loading…
Cancel
Save