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

新增 补料 退料 委外

Browse Source
master
hou 4 years ago
parent b10c8adea7 74ef32f2cb
commit d1cd6ea91a
9 changed files with 245 additions and 147 deletions
Show Stats Download Patch File Download Diff File

27
src/i18n/lang/cn.ts
Unescape Escape View File

@ -203,20 +203,23 @@ export default {
InventoryPleaseScan: "请扫描单号", InventoryPleaseScan: "请扫描单号",
InventoryFinish: "完成", InventoryFinish: "完成",
// 委外-入库 // 委外-入库
CommissionEntrant: "委外入库", CommissionEntrant:'委外入库',
CommissionedSingleNumber: "单号", CommissionedSingleNumber:'单号',
CommissionedMaterielNo: "物料号", CommissionedMaterielNo:'物料号',
CommissionedMaterielDesc: "物料描述", CommissionedMaterielDesc:'物料描述',
CommissionedDemandData: "需求数据", CommissionedDemandData:'需求数据',
CommissionedCumulativeData: "累计数据", CommissionedCumulativeData:'累计数据',
CommissionedLocation: "库位", CommissionedLocation:'库位',
CommissionedThisNumber: "本次数量", CommissionedThisNumber:'本次数量',
CommissionedEntrantDetails: "入库明细", CommissionedNumber:'入库数量',
CommissionedEntrantDetails:'入库明细',
CommissionedReceiptQuantity:'收货数量',
// 委外-出库 // 委外-出库
CommissionGoOut: "委外出库", CommissionGoOut:'委外出库',
CommissionedGoOutDetails: "出库明细", CommissionedGoOutDetails:'出库明细',
CommissionedGoOutNumber:'出库数量',
//移库 //移库
Warehouse_QueryCriteria: "查询条件", Warehouse_QueryCriteria: "查询条件",
Warehouse_TransferOrderNo: "移库单号", Warehouse_TransferOrderNo: "移库单号",

25
src/i18n/lang/en.ts
Unescape Escape View File

@ -208,19 +208,22 @@ export default {
InventoryFinish: "Finish", InventoryFinish: "Finish",
// 委外-入库 // 委外-入库
CommissionEntrant: "委外入库", CommissionEntrant:"委外入库",
CommissionedSingleNumber: "单号", CommissionedSingleNumber:"单号",
CommissionedMaterielNo: "物料号", CommissionedMaterielNo:"物料号",
CommissionedMaterielDesc: "物料描述", CommissionedMaterielDesc:"物料描述",
CommissionedDemandData: "需求数据", CommissionedDemandData:"需求数据",
CommissionedCumulativeData: "累计数据", CommissionedCumulativeData:"累计数据",
CommissionedLocation: "库位", CommissionedLocation:"库位",
CommissionedThisNumber: "本次数量", CommissionedThisNumber:"本次数量",
CommissionedEntrantDetails: "入库明细", CommissionedNumber:"入库数量",
CommissionedEntrantDetails:"入库明细",
CommissionedReceiptQuantity:"收货数量",
// 委外-出库 // 委外-出库
CommissionGoOut: "委外出库", CommissionGoOut:"委外出库",
CommissionedGoOutDetails: "出库明细", CommissionedGoOutDetails:"出库明细",
CommissionedGoOutNumber:"出库数量",
//移库 //移库
Warehouse_QueryCriteria: "Query criteria", Warehouse_QueryCriteria: "Query criteria",

29
src/pages/raw/commission/entrant/config.ts
Unescape Escape View File

@ -1,21 +1,40 @@
/*
* @Author: zhou lei
* @Date: 2021-11-10 17:14:44
* @LastEditTime: 2021-11-22 17:43:40
* @LastEditors: zhou lei
* @Description:
* @FilePath: /wms_haiwai_app/src/pages/raw/commission/entrant/config.ts
* 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
*/
/** /**
* 看单明细表格列 * 看单明细表格列
*/ */
import vm from '@/main'; import vm from '@/main';
export const headers = [ export const headers = [
{ {
label: vm.$t('message.product_barCode'), label: vm.$t('message.CommissionedSingleNumber'),
key: 'barcode', key: 'poNo',
width: 300, width: 200,
}, },
{ {
label: vm.$t('message.product_FGCode'), label: vm.$t('message.po_MaterielNo'),
key: 'materialCode', key: 'materialCode',
width: 300, width: 300,
}, },
{ {
label: vm.$t('message.product_FGDes'), label: vm.$t('message.CommissionedMaterielDesc'),
key: 'materialDesc', key: 'materialDesc',
width: 300, width: 300,
}, },
{
label: vm.$t('message.CommissionedReceiptQuantity'),
key: 'amount',
width: 200,
},
{
label: vm.$t('message.CommissionedLocation'),
key: 'wlCode',
width: 200,
}
]; ];

38
src/pages/raw/commission/entrant/detail.vue
Unescape Escape View File

@ -26,41 +26,8 @@
>{{ $t('message.po_Total') }} {{ model.materielList.length }} >{{ $t('message.po_Total') }} {{ model.materielList.length }}
{{ $t('message.po_Records') }}</u-col {{ $t('message.po_Records') }}</u-col
> >
<!-- <u-col :span="2">数量</u-col>-->
<!-- <u-col :span="4"><u-input v-model="locationCode"></u-input></u-col>-->
<!-- <u-col :span="3">-->
<!-- <u-button-->
<!-- size="mini"-->
<!-- type="warning"-->
<!-- :loading="$wait.is('*changeOrderInLocation')"-->
<!-- @click="changeLocation"-->
<!-- >-->
<!-- 拒收-->
<!-- </u-button>-->
<!-- </u-col>-->
</u-row> </u-row>
</div> </div>
<!-- <div class="container">-->
<!-- <u-row>-->
<!-- <u-col :span="4">-->
<!-- <u-button type="primary" @click="model.checkAllOrderInInfoList(!model.isCheckedAll)">-->
<!-- {{-->
<!-- model.isCheckedAll-->
<!-- ? this.$t('message.po_noSelectAll')-->
<!-- : this.$t('message.po_SelectAll')-->
<!-- }}-->
<!-- </u-button>-->
<!-- </u-col>-->
<!-- <u-col :span="4">-->
<!-- <u-button type="success" :loading="$wait.is('*submitOrderInEnter')" @click="onSubmit">-->
<!-- {{ $t('message.po_Submit') }}-->
<!-- </u-button>-->
<!-- </u-col>-->
<!-- <u-col :span="4">-->
<!-- <u-button @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>-->
<!-- </u-col>-->
<!-- </u-row>-->
<!-- </div>-->
</view> </view>
</view> </view>
</template> </template>
@ -72,7 +39,7 @@ import model from './model';
import { headers } from './config'; import { headers } from './config';
@Component @Component
export default class RawReceiptDetail extends BasePage { export default class RawCommissionEntrantDetail extends BasePage {
/** /**
* 页面Module * 页面Module
*/ */
@ -87,6 +54,9 @@ export default class RawReceiptDetail extends BasePage {
* 表头 * 表头
*/ */
headers = headers; headers = headers;
onLoad(params:any){
this.model.info(params.poNo)
}
/** /**
* 逐条修改 * 逐条修改

68
src/pages/raw/commission/entrant/model.ts
Unescape Escape View File

@ -30,10 +30,12 @@ export class ReturningModule extends VuexModule {
* 月台列表 * 月台列表
*/ */
returningTypeList: any[] = []; returningTypeList: any[] = [];
/** /**
* 物料列表 * 物料列表
*/ */
materielList: any[] = []; materielList: any[] = [];
locationCodeList: any[] = [];
//条码扫描的返回的结果 //条码扫描的返回的结果
oneMaterielDetail: any = {}; oneMaterielDetail: any = {};
@ -43,6 +45,72 @@ export class ReturningModule extends VuexModule {
orderInInfo: OrderInInfo = new OrderInInfo(); orderInInfo: OrderInInfo = new OrderInInfo();
//记账按钮的code码 //记账按钮的code码
code = ""; code = "";
/**
* 委外出库单号查询
* @param orderNo
*/
@Action
async queryOrder(form: any) {
const result = await http.post(url.material.commission.entrant.queryOrder, {
...form,
loginName: session.loginName,
factoryCode: session.factoryCode,
});
const orderInInfo = result.data.records[0] || {};
return { orderInInfo };
}
/**
* 库位
*/
// @MutationAction
// async queryByFactoryCodeAndWorkAreaCode() {
// const list: [] = await http.post(url.material.commission.goOut.queryByFactoryCodeAndWorkAreaCode, {
// factoryCode: session.factoryCode,
// whCode: session.warehouseCode,
// loginName: session.loginName,
// });
// const locationCodeList = list.map((item: any) => ({
// label: item.locationCode,
// value: item.locationCode,
// }));
// return { locationCodeList };
// }
/**
* 提交
*/
@Action
async materialComplete(form: any) {
const res = await http.post(
url.material.commission.goOut.materialComplete,
{
factoryCode: session.factoryCode,
loginName: session.loginName,
...form,
}
);
console.log(res, ">>>>>res");
}
/**
* 获取物料
*
* @returns
* @memberof ReturningModule
*/
@MutationAction
async info(poNo: string) {
const list: [] = await http.post(url.material.commission.entrant.info, {
factoryCode: session.factoryCode,
poNo: poNo,
loginName: session.loginName,
});
const locationCodeList = list.map((item: any) => ({
label: item.locationCode,
value: item.locationCode,
}));
return { locationCodeList };
}
/** /**
* 查询月台列表 * 查询月台列表
*/ */

29
src/pages/raw/commission/goOut/config.ts
Unescape Escape View File

@ -1,21 +1,40 @@
/*
* @Author: zhou lei
* @Date: 2021-11-11 11:09:57
* @LastEditTime: 2021-11-22 15:16:21
* @LastEditors: zhou lei
* @Description:
* @FilePath: /wms_haiwai_app/src/pages/raw/commission/goOut/config.ts
* 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司
*/
/** /**
* 看单明细表格列 * 看单明细表格列
*/ */
import vm from '@/main'; import vm from '@/main';
export const headers = [ export const headers = [
{ {
label: vm.$t('message.product_barCode'), label: vm.$t('message.CommissionedSingleNumber'),
key: 'barcode', key: 'poNo',
width: 300, width: 200,
}, },
{ {
label: vm.$t('message.product_FGCode'), label: vm.$t('message.po_MaterielNo'),
key: 'materialCode', key: 'materialCode',
width: 300, width: 300,
}, },
{ {
label: vm.$t('message.product_FGDes'), label: vm.$t('message.CommissionedMaterielDesc'),
key: 'materialDesc', key: 'materialDesc',
width: 300, width: 300,
}, },
{
label: vm.$t('message.CommissionedGoOutNumber'),
key: 'outAmount',
width: 200,
},
{
label: vm.$t('message.CommissionedLocation'),
key: 'wlCode',
width: 200,
}
]; ];

57
src/pages/raw/commission/goOut/detail.vue
Unescape Escape View File

@ -4,7 +4,7 @@
<view class="left"> <view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" /> <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
</view> </view>
<view class="title">{{ $t('message.CommissionedGoOutDetails') }}</view> <view class="title">{{ $t("message.CommissionedGoOutDetails") }}</view>
<view class="right"></view> <view class="right"></view>
</view> </view>
<view class="table-wrapper"> <view class="table-wrapper">
@ -23,56 +23,23 @@
<div class="extra"> <div class="extra">
<u-row class="bottom-info"> <u-row class="bottom-info">
<u-col :span="12" <u-col :span="12"
>{{ $t('message.po_Total') }} {{ model.materielList.length }} >{{ $t("message.po_Total") }} {{ model.materielList.length }}
{{ $t('message.po_Records') }}</u-col {{ $t("message.po_Records") }}</u-col
> >
<!-- <u-col :span="2">数量</u-col>-->
<!-- <u-col :span="4"><u-input v-model="locationCode"></u-input></u-col>-->
<!-- <u-col :span="3">-->
<!-- <u-button-->
<!-- size="mini"-->
<!-- type="warning"-->
<!-- :loading="$wait.is('*changeOrderInLocation')"-->
<!-- @click="changeLocation"-->
<!-- >-->
<!-- 拒收-->
<!-- </u-button>-->
<!-- </u-col>-->
</u-row> </u-row>
</div> </div>
<!-- <div class="container">-->
<!-- <u-row>-->
<!-- <u-col :span="4">-->
<!-- <u-button type="primary" @click="model.checkAllOrderInInfoList(!model.isCheckedAll)">-->
<!-- {{-->
<!-- model.isCheckedAll-->
<!-- ? this.$t('message.po_noSelectAll')-->
<!-- : this.$t('message.po_SelectAll')-->
<!-- }}-->
<!-- </u-button>-->
<!-- </u-col>-->
<!-- <u-col :span="4">-->
<!-- <u-button type="success" :loading="$wait.is('*submitOrderInEnter')" @click="onSubmit">-->
<!-- {{ $t('message.po_Submit') }}-->
<!-- </u-button>-->
<!-- </u-col>-->
<!-- <u-col :span="4">-->
<!-- <u-button @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>-->
<!-- </u-col>-->
<!-- </u-row>-->
<!-- </div>-->
</view> </view>
</view> </view>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component } from 'vue-property-decorator'; import { Component } from "vue-property-decorator";
import { BasePage } from '@/components/base/page'; import { BasePage } from "@/components/base/page";
import model from './model'; import model from "./model";
import { headers } from './config'; import { headers } from "./config";
@Component @Component
export default class RawReceiptDetail extends BasePage { export default class RawCommissionGoOutDetail extends BasePage {
/** /**
* 页面Module * 页面Module
*/ */
@ -81,12 +48,15 @@ export default class RawReceiptDetail extends BasePage {
/** /**
* 库位 * 库位
*/ */
locationCode = ''; locationCode = "";
/** /**
* 表头 * 表头
*/ */
headers = headers; headers = headers;
onLoad(params: any) {
this.model.outInfo(params.poNo);
}
/** /**
* 逐条修改 * 逐条修改
@ -114,7 +84,8 @@ export default class RawReceiptDetail extends BasePage {
<style lang="scss" scoped> <style lang="scss" scoped>
.page-receipt-detail { .page-receipt-detail {
background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat; background: #f2f2f2
linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
background-size: 100% 600rpx; background-size: 100% 600rpx;
padding: 30rpx; padding: 30rpx;
min-height: 100%; min-height: 100%;

88
src/pages/raw/commission/goOut/model.ts
Unescape Escape View File

@ -34,7 +34,7 @@ export class ReturningModule extends VuexModule {
* 物料列表 * 物料列表
*/ */
materielList: any[] = []; materielList: any[] = [];
locationCodeList: any[] = [];
//条码扫描的返回的结果 //条码扫描的返回的结果
oneMaterielDetail: any = {}; oneMaterielDetail: any = {};
/** /**
@ -44,49 +44,69 @@ export class ReturningModule extends VuexModule {
//记账按钮的code码 //记账按钮的code码
code = ""; code = "";
/** /**
* 查询月台列表 * 委外出库单号查询
* @param orderNo
*/
@Action
async queryOrder(form: any) {
const result = await http.post(url.material.commission.goOut.queryOrder, {
...form,
loginName: session.loginName,
factoryCode: session.factoryCode,
});
const orderInInfo = result.data.records[0] || {};
return { orderInInfo };
}
/**
* 库位
*/
// @MutationAction
// async queryByFactoryCodeAndWorkAreaCode() {
// const list: [] = await http.post(url.material.commission.goOut.queryByFactoryCodeAndWorkAreaCode, {
// factoryCode: session.factoryCode,
// whCode: session.warehouseCode,
// loginName: session.loginName,
// });
// const locationCodeList = list.map((item: any) => ({
// label: item.locationCode,
// value: item.locationCode,
// }));
// return { locationCodeList };
// }
/**
* 获取物料
*
* @returns
* @memberof ReturningModule
*/ */
@MutationAction @MutationAction
async queryReturningTypeList() { async outInfo(poNo: string) {
const list: [] = await http.post(url.outbound.stoOutbound.yuetaiType, { const list: [] = await http.post(url.material.commission.goOut.outInfo, {
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
whCode: session.warehouseCode, poNo: poNo,
loginName: session.loginName, loginName: session.loginName,
}); });
const returningTypeList = list.map((item: any) => ({ const locationCodeList = list.map((item: any) => ({
label: item.dockName, label: item.locationCode,
value: item.dockCode, value: item.locationCode,
})); }));
return { returningTypeList }; return { locationCodeList };
} }
/** /**
* 查询订单号 * 提交
* @param orderNo
*/ */
@MutationAction @Action
async queryOrderInInfo(stoNo: string) { async materialComplete(form: any) {
const result = await http.post(url.outbound.stoOutbound.info, { const res = await http.post(
stoNo, url.material.commission.goOut.materialComplete,
deleteFlag: 2, {
finalState: 3, factoryCode: session.factoryCode,
loginName: session.loginName, loginName: session.loginName,
}); ...form,
let stoAmount = 0; }
result.data.records.forEach((item: any) => { );
stoAmount += item.orderAmount; console.log(res, ">>>>>res");
});
const materielList = result.data.records.map((item: any) => ({
label: item.materialCode,
value: item.stoItem,
...item,
}));
console.log("materielList", materielList);
if (result.data.records[0]) {
result.data.records[0].stoAmount = stoAmount;
}
const orderInInfo = result.data.records[0] || {};
return { orderInInfo, materielList };
} }
/** /**

25
src/utils/url.ts
Unescape Escape View File

@ -86,6 +86,31 @@ export const url = {
// 5.盘点完成 // 5.盘点完成
orderComplete: "/product/finished/checkRaw/orderComplete", orderComplete: "/product/finished/checkRaw/orderComplete",
}, },
// 委外 commission
commission: {
// 出库 goOut
goOut:{
// 出库单号查询
queryOrder: "/material/outsourcing/queryOrder",
// 库位下拉列表
queryByFactoryCodeAndWorkAreaCode: "/wmspda/fg/queryByFactoryCodeAndWorkAreaCode",
// 出库提交
materialComplete: "/material/outsourcing/materialComplete",
// 出库明细查询
outInfo: "/material/outsourcing/outInfo",
},
entrant:{
// 单号查询
queryOrder:'/material/outsourcing/into/queryOrder',
// 库位下拉列表
queryByFactoryCodeAndWorkAreaCode: "/wmspda/fg/queryByFactoryCodeAndWorkAreaCode",
// 提交
materialComplete:'/material/outsourcing/into/materialComplete',
// 明细查询
info:'/material/outsourcing/into/info',
}
},
}, },
SFG: { SFG: {
DumpListFH: { DumpListFH: {

Write Preview
Loading…
Cancel
Save