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

Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app

Browse Source
master
guoshuang 4 years ago
parent 9babd49ac1 c680596f71
commit 449d5ed8b4
12 changed files with 767 additions and 253 deletions
Show Stats Download Patch File Download Diff File

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

@ -42,6 +42,7 @@ export default {
workArea_WorkAreaName: '工作区名称',
workArea_WarehouseClassify: '仓库类',
workArea_Confirm: '确定',
ReservoirArea: '库区',
//原材料菜单
rawMenu_ReceivingGoods: '收货',
rawMenu_Handover: '交接',
@ -156,6 +157,9 @@ export default {
Pi_QuantityHandedOver: '已交接数量',
Pi_distribution: '分配',
successful: '查询成功',
ModelCode: '型号编码',
ModelName: '型号名称',
ModelScanned: '型号已扫',
//汇总交接
Summary_Query: '汇总查询',
@ -198,8 +202,11 @@ export default {
return_Tip4: '退料数量不能大于总数',
quantitys: '不能大于应退货数量',
actual: '实际退货数量不等于应退货数量',
Requisition: '领用单',
greater: '不能大于总数',
receiveAStation: '接收工位',
collecting: '请输入领用单号',
MaterialCount: '物料盘点',
//库内主菜单
Warehouse: '成品库内',
@ -225,6 +232,7 @@ export default {
InventoryMateriel: '物料名',
InventoryTotalNumber: '盘点总数',
InventoryPleaseScan: '请扫描单号',
InventoryNumber: '盘点单号',
InventoryFinish: '完成',
// 委外-入库
@ -370,8 +378,10 @@ export default {
Warehouse_Tip5: '请扫描单号',
Warehouse_Tip6: '请选择物料',
Warehouse_Tip7: '盘点未完成，确定继续吗',
selectCode: '请先选择编码',
Warehouse_Tip8: '请输入成本中心',
Warehouse_Tip9: '操作成功',
DocumentNumber: '文件号',
Warehouse_Tip10: '请选择sap库存地点',
Warehouse_Tip11: '该单号不存在或已经操作完成',
Warehouse_TotalNumber: '总数',
@ -380,6 +390,7 @@ export default {
Warehouse_WX: '外销',
Warehouse_YJ: '样机',
Warehouse_BCP: '半成品',
DocumentScanned: '单据已扫',
//提示
AppendMateriel1: '请输入正确的库位和数量',

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

@ -216,6 +216,16 @@ export default {
InventoryTotalNumber: 'Total',
InventoryPleaseScan: 'Please scan No.',
InventoryFinish: 'Finish',
collecting: 'Please enter the collecting doc No',
MaterialCount: 'Material count',
InventoryNumber: 'Inventory number',
DocumentScanned: 'Document scanned',
ReservoirArea: 'Reservoir area',
ModelCode: 'Model code',
ModelName: 'Model name',
ModelScanned: 'Model scanned',
selectCode: 'Please select code first',
DocumentNumber: 'Document number',
// 委外-入库
CommissionEntrant: 'Subcontracting receipt',
@ -224,6 +234,7 @@ export default {
CommissionedMaterielDesc: 'describe',
SourceLocation: 'Source location',
barcode: 'Please enter barcode',
Requisition: 'Requisition',
scrapForm: 'Please scan the scrap form first',
finishedProduct: 'Please select finished product code first',
CommissionedDemandData: 'Demand',

8
src/pages.json
Unescape Escape View File

@ -25,6 +25,14 @@
"navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
}
},
{
"path": "pages/product/warehouse/MaterialInventory/index",
"style": {
"navigationBarTitleText": "物料盘点",
"navigationStyle": "custom", // 隐藏系统导航栏
"navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
}
},
{
"path": "pages/product/outbound/index",
"style": {

308
src/pages/product/warehouse/MaterialInventory/index.vue
Unescape Escape View File

@ -0,0 +1,308 @@
<template>
<view class="page-product-receipt">
<view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
<view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack({ delta: 1 })" />
</view>
<view class="title">{{ $t('message.MaterialCount') }}</view>
<view class="right"></view>
</view>
<u-form class="form" ref="form" :model="form" label-width="180rpx">
<!-- 盘点单号 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.InventoryNumber') }}</view>
<u-search :placeholder="$t('message.Commission_tips1')" v-model="form.pddNo" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
</view>
</view>
<!-- 单据已扫 -->
<u-form-item :label="$t('message.DocumentScanned')">
<u-input :disabled="true" v-model="total" placeholder="" />
</u-form-item>
<!-- 库区 -->
<u-form-item :label="$t('message.ReservoirArea')">
<u-input :disabled="true" v-model="areaCode" placeholder="" />
</u-form-item>
<!-- 型号编码 -->
<u-form-item :label="$t('message.ModelCode')">
<jPicker sureColor="#ff0000" style="width: 260rpx" @bindpicker="materialChoice" showKey="value" valKey="value" :val="wl.value" class="search" :options="codeList" />
</u-form-item>
<!-- 型号名称 -->
<u-form-item :label="$t('message.ModelName')">
<u-input :disabled="true" v-model="Some.productDescZh" placeholder="" />
</u-form-item>
<!-- 型号已扫 -->
<u-form-item :label="$t('message.ModelScanned')">
<u-input v-model="Some.spQty" :disabled="true" placeholder="" />
</u-form-item>
<!-- 条码 -->
<u-form-item :label="$t('message.product_BarCode')">
<u-search :placeholder="$t('message.barcode')" v-model="form.barcode" @search="scanning" :show-action="false"></u-search>
</u-form-item>
</u-form>
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="6">
<u-button type="primary" @click="onSubmit">{{ $t('message.product_Confirm') }}</u-button>
</u-col>
<u-col :span="6">
<u-button type="error" @click="uni.navigateBack({ delta: 1 })">{{ $t('message.po_Return') }}</u-button>
</u-col>
</u-row>
</view>
</view>
</template>
<script lang="ts">
import { Component, Ref } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import { VForm, VFormRules } from 'vue/types/form';
import model from './model';
import jPicker from '@/components/J-Picker/jPicker.vue';
import { session } from '@/store/modules/session';
interface OptionType {
label: string;
value: string;
}
@Component({
components: {
jPicker,
},
})
export default class ProductCheckReceipt extends BasePage {
@Ref('form') readonly $form!: VForm;
model = model;
//表单
form = {
pddNo: '',
barcode: '',
};
wl: any = {};
Some: any = {};
codeList: any = [];
total: any = '';
areaCode: any = '';
// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
onReady() {
this.model.orderInInfo.productDescZh = '';
this.model.orderInInfo.productCode = '';
this.model.orderInInfo.qty = '';
this.model.orderInInfo.locCode = '';
this.model.orderInInfo.costCenter = '';
}
//单号查询
async query() {
if (!this.form.pddNo) {
uni.showToast({
icon: 'none',
title: this.$t('message.Commission_tips1') as string,
});
return;
}
let param = {
factoryCode: session.factoryCode,
loginName: session.loginName,
pddNo: this.form.pddNo,
};
await this.model.queryScrapList(param);
if (this.model.code == '1') {
uni.showToast({
icon: 'none',
title: this.$t('message.product_Tip8') as string,
});
let num: number = 0;
this.model.modelList.forEach((item: any) => {
num += parseFloat(item.spQty);
let arr: any = {};
arr.value = item.productCode;
arr.label = item.productCode;
this.codeList.push(arr);
});
this.total = num;
this.areaCode = this.model.modelList[0].areaCode;
this.Some = this.model.modelList[0];
}
}
//选择成品编码
materialChoice(e: any) {
this.wl = e.pickerName;
this.model.modelList.forEach((item: any) => {
if (item.productCode == this.wl.value) {
this.Some = item;
}
});
}
//条码扫码
async scanning() {
if (!this.form.pddNo) {
uni.showToast({
icon: 'none',
title: this.$t('message.scrapForm') as string,
});
}
let params = {
factoryCode: session.factoryCode,
user: session.loginName,
pdCd: this.form.pddNo,
regionCode: this.Some.regionCode,
areaCode: this.Some.areaCode,
whCode: this.Some.whCode,
snFlag: '1',
pdMode: '10',
sn: this.form.barcode,
productCode: this.wl.value,
qty: '1',
};
await this.model.getProductCode(params);
if (this.model.code == '1') {
uni.showToast({
icon: 'none',
title: this.$t('message.product_Tip8') as string,
});
this.total += 1;
this.model.modelList.forEach((item: any, index: any) => {
if (item.productCode == this.wl.value) {
this.model.modelList[index].spQty += 1;
}
});
this.form.barcode = '';
}
}
//确定
async onSubmit() {
if (this.form.pddNo == '') {
uni.showToast({
icon: 'none',
title: this.$t('message.Warehouse_Tip5') as string,
});
return;
}
if (this.total == '') {
uni.showToast({
icon: 'none',
title: this.$t('message.Warehouse_Tip5') as string,
});
return;
}
if (!this.Some) {
uni.showToast({
icon: 'none',
title: this.$t('message.selectCode') as string,
});
return;
}
const params = {
factoryCode: session.factoryCode,
user: session.loginName,
pddno: this.form.pddNo,
regionCode: this.Some.regionCode,
areaCode: this.Some.areaCode,
whCode: this.Some.whCode,
snFlag: '1',
pdMode: '10',
};
await this.model.onTakeoutConfirm(params);
if (this.model.status == 'S') {
uni.showToast({
icon: 'none',
title: this.$t('message.success') as string,
});
this.form.pddNo = '';
this.form.barcode = '';
this.wl = {};
this.Some = {};
this.codeList = [];
this.total = '';
this.areaCode = '';
this.model.modelList = [];
}
}
}
</script>
<style lang="scss" scoped>
.page-product-receipt {
background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #4a78ea 51%, #1753ea 100%) no-repeat;
background-size: 100% 600rpx;
padding: 118rpx 30rpx 162rpx;
min-height: 100%;
.header {
position: fixed;
top: 36rpx;
left: 0;
right: 0;
z-index: 99;
display: flex;
height: 88rpx;
line-height: 88rpx;
color: #fff;
font-size: 34rpx;
font-weight: 500;
text-align: center;
.title {
flex: 3;
}
.left,
.right {
flex: 1;
}
.icon {
display: flex;
justify-content: center;
align-items: center;
width: 88rpx;
height: 88rpx;
}
}
.form {
background-color: #fff;
padding: 40rpx;
border-radius: 10rpx;
box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
.u-form-item {
padding: 30rpx 0;
line-height: 35rpx;
}
.single {
width: 100%;
height: 100rpx;
display: flex;
.single-left {
width: 80%;
height: 100%;
display: flex;
view {
width: 110rpx;
height: 100%;
line-height: 100rpx;
}
}
.single-right {
button {
margin-top: 15rpx;
width: 150rpx;
height: 70rpx;
}
}
}
}
.bottom-bar {
position: fixed;
bottom: 0;
left: 0;
right: 0;
z-index: 99;
background: #ffffff;
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
padding: 20rpx;
}
.button-bar {
}
}
</style>

91
src/pages/product/warehouse/MaterialInventory/model.ts
Unescape Escape View File

@ -0,0 +1,91 @@
import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
import store from '@/store';
import http from '@/utils/request';
import { url } from '@/utils/url';
import { session } from '@/store/modules/session';
// import { page } from '@/utils/page';
import vm from '@/main';
class OrderInInfo {
productDescZh?: string;
qty?: string;
custCode?: string;
custCodeName?: string;
productCode?: string;
locCode?: string;
costCenter?: string;
}
@Module({
namespaced: true,
dynamic: true,
store,
name: 'product.warehouse.wholeCollect',
})
export class wholeCollect extends VuexModule {
WlList = [];
code: any = '';
recordsList: any = [];
choiceCodeList: any = [];
dnNo = '';
orderInInfo: OrderInInfo = new OrderInInfo();
modelList: any = [];
status: any = '';
@MutationAction
async queryLocation() {
const result: any = await http.get(url.warehouse.wholeTransfer.list, {
params: {
factoryCode: session.factoryCode,
loginName: session.loginName,
},
});
// console.log('库位数据',result)
const WlList = result.data.map((_: any) => ({
label: _.locationCode,
value: _.locationCode,
}));
return { WlList };
}
@MutationAction
async queryScrapList(param: any) {
const res: any = await http.post(url.warehouse.MaterialInventory.list, param);
const code = res.code;
const modelList = res.data;
console.log('modelList', modelList);
return { code, modelList };
}
/**
* 查询单号
* 查询DN单号
* @param dnNo
*/
@MutationAction
async getProductCode(params: any) {
const res: any = await http.post(url.warehouse.MaterialInventory.content, params);
const code = res.code;
console.log('resssss', res);
return { code };
}
@MutationAction
async onTakeoutConfirm(params: any) {
const records: any = await http.post(url.warehouse.MaterialInventory.commit, params);
const status = records.data.status;
return { status };
}
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
async changeOrderInLocation(kw: string) {
await http.post('/wmspda/material/orderin/enter', {
loginName: session.loginName,
warehouseCode: '',
factoryCode: session.factoryCode,
locationCode: kw,
});
return kw;
}
}
export default getModule(wholeCollect);

195
src/pages/product/warehouse/wholeCollect/index.vue
Unescape Escape View File

@ -8,37 +8,50 @@
<view class="right"></view>
</view>
<u-form class="form" ref="form" :model="form" label-width="180rpx">
<!-- 条码 -->
<u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
<u-search :placeholder="$t('message.po_PleaseInput')" v-model="form.productCode" @search="model.getProductCode" :show-action="false"></u-search>
</u-form-item>
<!-- 领用单 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.Requisition') }}</view>
<u-search :placeholder="$t('message.collecting')" v-model="form.order3" @search="query" :show-action="false"></u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
</view>
</view>
<!-- 成品编码 -->
<u-form-item :label="$t('message.product_FGCode')">
<u-input :disabled="true" v-model="model.orderInInfo.productCode" placeholder="" />
<jPicker sureColor="#ff0000" style="width: 260rpx" @bindpicker="materialChoice" showKey="value" valKey="value" :val="wl.value" class="search" :options="model.choiceCodeList" />
</u-form-item>
<!-- 成品描述 -->
<u-form-item :label="$t('message.product_FGDes')">
<u-input :disabled="true" v-model="model.orderInInfo.productDescZh" placeholder="" />
<u-input :disabled="true" v-model="Some.productDescZh" placeholder="" />
</u-form-item>
<!-- 数量 -->
<u-form-item :label="$t('message.product_Number')">
<u-input :disabled="true" v-model="model.orderInInfo.qty" placeholder="" />
<u-input :disabled="true" v-model="Some.qty" placeholder="" />
</u-form-item>
<!-- 库位 -->
<u-form-item :label="$t('message.product_Location')">
<u-input :disabled="true" v-model="model.orderInInfo.locCode" placeholder="" />
<!-- 源库位 -->
<u-form-item :label="$t('message.SourceLocation')">
<u-input :disabled="true" v-model="Some.originWl" placeholder="" />
</u-form-item>
<!-- 成本中心 -->
<u-form-item :required="true" :label="$t('message.product_costCenter')">
<u-input v-model="model.orderInInfo.costCenter" :placeholder="$t('message.po_PleaseInput')" />
<u-form-item :label="$t('message.product_costCenter')">
<u-input v-model="Some.costCenter" :disabled="true" :placeholder="$t('message.po_PleaseInput')" />
</u-form-item>
<!-- 条码 -->
<u-form-item :label="$t('message.product_BarCode')">
<u-search :placeholder="$t('message.barcode')" v-model="form.barcode" @search="scanning" :show-action="false"></u-search>
</u-form-item>
</u-form>
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="6">
<u-button type="primary" @click="onSubmit">{{ $t('message.workArea_Confirm') }}</u-button>
<u-col :span="4">
<u-button type="primary" @click="onSubmit">{{ $t('message.detailed') }}</u-button>
</u-col>
<u-col :span="6">
<u-col :span="4">
<u-button type="primary" @click="onSubmit">{{ $t('message.InventoryFinish') }}</u-button>
</u-col>
<u-col :span="4">
<u-button type="error" @click="uni.navigateBack({ delta: 1 })">{{ $t('message.po_Return') }}</u-button>
</u-col>
</u-row>
@ -50,33 +63,27 @@ import { Component, Ref } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import { VForm, VFormRules } from 'vue/types/form';
import model from './model';
import jPicker from '@/components/J-Picker/jPicker.vue';
import { session } from '@/store/modules/session';
interface OptionType {
label: string;
value: string;
}
@Component
@Component({
components: {
jPicker,
},
})
export default class ProductCheckReceipt extends BasePage {
@Ref('form') readonly $form!: VForm;
model = model;
//表单
form = {
...this.model.orderInInfo,
originWl: {} as OptionType,
aimWl: {} as OptionType,
qty: {} as OptionType,
order3: '',
barcode: '',
};
originWlSelect = false;
aimWlSelect = false;
cboPlaceSelect = false;
rules: VFormRules<any> = {
documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') as string }],
originWl: [{ required: true, message: this.$t('message.Warehouse_Tip2') as string }],
aimWl: [{ required: true, message: this.$t('message.Warehouse_Tip3') as string }],
cboPlace: [{ required: true, message: this.$t('message.Warehouse_Tip4') as string }],
};
value = '';
show = false;
wl: any = {};
Some: any = {};
// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
onReady() {
this.model.orderInInfo.productDescZh = '';
@ -84,49 +91,107 @@ export default class ProductCheckReceipt extends BasePage {
this.model.orderInInfo.qty = '';
this.model.orderInInfo.locCode = '';
this.model.orderInInfo.costCenter = '';
this.$form.setRules(this.rules);
this.model.queryLocation();
}
onSubmit() {
this.$form.validate((valid: boolean) => {
if (!valid) return;
if (!this.form.productCode) {
//单号查询
async query() {
if (!this.form.order3) {
uni.showToast({
icon: 'none',
title: this.$t('message.Warehouse_Tip5') as string,
title: this.$t('message.Commission_tips1') as string,
});
return;
}
if (!this.model.orderInInfo.costCenter) {
let param = {
factoryCode: session.factoryCode,
loginName: session.loginName,
order3: this.form.order3,
orderType: 'LY',
page: '1',
rows: '50',
};
await this.model.queryScrapList(param);
if (this.model.code == '1') {
uni.showToast({
icon: 'none',
title: this.$t('message.Warehouse_Tip8') as string,
title: this.$t('message.product_Tip8') as string,
});
this.wl.value = this.model.choiceCodeList[0].value;
this.Some = this.model.recordsList[0];
}
}
//选择成品编码
materialChoice(e: any) {
this.wl = e.pickerName;
this.model.recordsList.forEach((item: any) => {
if (item.productCode == e.pickerName.value) {
this.Some = item;
}
});
}
//条码扫码
async scanning() {
if (!this.form.order3) {
uni.showToast({
icon: 'none',
title: this.$t('message.scrapForm') as string,
});
}
if (!this.Some) {
uni.showToast({
icon: 'none',
title: this.$t('message.finishedProduct') as string,
});
}
if (!this.form.barcode) {
uni.showToast({
icon: 'none',
title: this.$t('message.barcode') as string,
});
return;
}
console.log('orderlist');
let params = {
factoryCode: session.factoryCode,
loginName: session.loginName,
barcode: this.form.barcode,
productCode: this.wl.value,
locCode: this.Some.originWl,
};
await this.model.getProductCode(params);
if (this.model.code == '1') {
uni.showToast({
icon: 'none',
title: this.$t('message.product_Tip8') as string,
});
}
}
//确定
async onSubmit() {
const orderlist = [
{
...this.model.orderInInfo,
// originWl: this.form.originWl.value,
originWl: this.model.orderInInfo.locCode,
// aimWl: this.form.aimWl.value, custcode
originWl: this.Some.originWl,
barCode: this.form.barcode,
aimWl: this.Some.aimWl,
type: '0',
orderType: '2',
keepBy: session.loginName,
factoryCode: session.factoryCode,
keepBy: session.loginName as string,
factoryCode: session.factoryCode as string,
order3: this.form.order3,
costCenter: this.Some.costCenter,
},
];
console.log('orderlist', orderlist);
this.model.onTakeoutConfirm(orderlist);
this.model.orderInInfo.productDescZh = '';
this.model.orderInInfo.productCode = '';
this.model.orderInInfo.qty = '';
this.model.orderInInfo.locCode = '';
this.model.orderInInfo.costCenter = '';
this.form.productCode = '';
await this.model.onTakeoutConfirm(orderlist);
if (this.model.code == '1') {
uni.showToast({
icon: 'none',
title: this.$t('message.success') as string,
});
}
this.Some = {};
this.wl = {};
this.form.order3 = '';
this.form.barcode = '';
}
}
</script>
<style lang="scss" scoped>
@ -175,6 +240,28 @@ export default class ProductCheckReceipt extends BasePage {
padding: 30rpx 0;
line-height: 35rpx;
}
.single {
width: 100%;
height: 100rpx;
display: flex;
.single-left {
width: 80%;
height: 100%;
display: flex;
view {
width: 110rpx;
height: 100%;
line-height: 100rpx;
}
}
.single-right {
button {
margin-top: 15rpx;
width: 150rpx;
height: 70rpx;
}
}
}
}
.bottom-bar {

51
src/pages/product/warehouse/wholeCollect/model.ts
Unescape Escape View File

@ -27,7 +27,9 @@ export class wholeCollect extends VuexModule {
* 库位地点列表
*/
WlList = [];
code: any = '';
recordsList: any = [];
choiceCodeList: any = [];
/**
* 物料型号类型
*/
@ -77,40 +79,39 @@ export class wholeCollect extends VuexModule {
return { WlList };
}
@MutationAction
async queryScrapList(param: any) {
const res: any = await http.post(url.warehouse.rowTransfer.list, param);
const code = res.code;
console.log('res', res);
const recordsList = res.data.records;
const choiceCodeList = [];
recordsList.forEach((item: any) => {
let arr: any = {};
arr.label = item.productCode;
arr.value = item.productCode;
choiceCodeList.push(arr);
});
console.log('choiceCodeList', choiceCodeList);
return { code, recordsList, choiceCodeList };
}
/**
* 查询单号
* 查询DN单号
* @param dnNo
*/
@MutationAction
async getProductCode(barcode: string) {
const res: any = await http.post(url.warehouse.wholeTransfer.content, {
barcode,
factoryCode: session.factoryCode,
loginName: session.loginName,
});
console.log('获取来的数据', res.data.records);
const orderInInfo = res.data.records[0] || {};
if (orderInInfo.custCode == '0') {
orderInInfo.custCodeName = vm.$t('message.Warehouse_NX') as any;
} else if (orderInInfo.custCode == '1') {
orderInInfo.custCodeName = vm.$t('message.Warehouse_WX') as any;
} else if (orderInInfo.custCode == '2') {
orderInInfo.custCodeName = vm.$t('message.Warehouse_YJ') as any;
} else if (orderInInfo.custCode == '4') {
orderInInfo.custCodeName = vm.$t('message.Warehouse_BCP') as any;
async getProductCode(params: any) {
const res: any = await http.post(url.warehouse.wholeTransfer.content, params);
const orderInInfo = res.data.records[0];
const code = res.code;
return { code, orderInInfo };
}
return { orderInInfo };
}
@MutationAction
async onTakeoutConfirm(list: any[]) {
const records: any = await http.post(url.warehouse.rowTransfer.commit, list);
if (records.code == 1) {
uni.showToast({ icon: 'success', title: 'success' });
// uni.navigateTo({ url: page.product.warehouse.index });
}
return {};
const code = records.code;
return { code };
}
// /**
// * 提交看单明细

46
src/pages/product/warehouse/wholeScrap/index.vue
Unescape Escape View File

@ -35,12 +35,16 @@
<u-input :disabled="true" v-model="Some.originWl" placeholder="" />
</u-form-item>
<!-- 目标库位 -->
<u-form-item :required="true" :label="$t('message.Warehouse_TargetLocation')" prop="aimWl">
<u-form-item :label="$t('message.Warehouse_TargetLocation')" prop="aimWl">
<u-input :disabled="true" v-model="Some.aimWl" placeholder="" />
</u-form-item>
<!-- 成本中心 -->
<u-form-item :required="true" :label="$t('message.product_costCenter')">
<u-input v-model="Some.costCenter" :placeholder="$t('message.po_PleaseInput')" />
<u-form-item :label="$t('message.product_costCenter')">
<u-input v-model="Some.costCenter" :disabled="true" placeholder="" />
</u-form-item>
<!-- 文件号 -->
<u-form-item :label="$t('message.DocumentNumber')">
<u-input v-model="Some.fileNo" :disabled="true" placeholder="" />
</u-form-item>
<!-- 条码 -->
<u-form-item :label="$t('message.product_BarCode')">
@ -50,7 +54,7 @@
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="4">
<u-button type="primary" @click="onSubmit">{{ $t('message.detailed') }}</u-button>
<u-button type="primary">{{ $t('message.detailed') }}</u-button>
</u-col>
<u-col :span="4">
<u-button type="primary" @click="onSubmit">{{ $t('message.InventoryFinish') }}</u-button>
@ -82,19 +86,8 @@ interface OptionType {
},
})
export default class productCheckReceipt extends BasePage {
/**
* 表单引用
*/
@Ref('form') readonly $form!: VForm;
/**
* 页面Module
*/
model = model;
/**
* 表单数据
*/
form = {
productCode: '',
order3: '',
@ -102,6 +95,7 @@ export default class productCheckReceipt extends BasePage {
};
wl: any = {};
Some: any = {};
//选择成品编码
materialChoice(e: any) {
this.wl = e.pickerName;
this.model.recordsList.forEach((item: any) => {
@ -110,6 +104,7 @@ export default class productCheckReceipt extends BasePage {
}
});
}
//条码扫码
async scanning() {
if (!this.form.order3) {
uni.showToast({
@ -145,16 +140,7 @@ export default class productCheckReceipt extends BasePage {
});
}
}
rules: VFormRules<any> = {
documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') as string }],
// originWl: [{ required: true, message: '请选择库位地点' }],
aimWl: [{ required: true, message: this.$t('message.Warehouse_Tip3') as string }],
cboPlace: [{ required: true, message: this.$t('message.Warehouse_Tip4') as string }],
};
value = '';
show = false;
// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
onReady() {
this.model.orderInInfo.productDescZh = '';
@ -162,8 +148,8 @@ export default class productCheckReceipt extends BasePage {
this.model.orderInInfo.qty = '';
this.model.orderInInfo.locCode = '';
this.model.orderInInfo.costCenter = '';
this.$form.setRules(this.rules);
}
//单号查询
async query() {
if (!this.form.order3) {
uni.showToast({
@ -190,9 +176,8 @@ export default class productCheckReceipt extends BasePage {
this.Some = this.model.recordsList[0];
}
}
onSubmit() {
this.$form.validate(async (valid: boolean) => {
if (!valid) return;
//确定
async onSubmit() {
const orderlist = [
{
...this.model.orderInInfo,
@ -205,6 +190,7 @@ export default class productCheckReceipt extends BasePage {
factoryCode: session.factoryCode as string,
order3: this.form.order3,
costCenter: this.Some.costCenter,
fileNo: this.Some.fileNo,
},
];
await this.model.onTakeoutConfirm(orderlist);
@ -218,7 +204,6 @@ export default class productCheckReceipt extends BasePage {
this.wl = {};
this.form.order3 = '';
this.form.barcode = '';
});
}
}
</script>
@ -303,8 +288,5 @@ export default class productCheckReceipt extends BasePage {
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
padding: 20rpx;
}
.button-bar {
}
}
</style>

4
src/pages/raw/handover/aggregating/model.ts
Unescape Escape View File

@ -236,6 +236,10 @@ export class AggregatingModule extends VuexModule {
const { queryParams, proOrderResultList } = params;
await http.post(url.sumscan.lock.list, queryParams);
const orderList = cloneDeep<any>(proOrderResultList);
console.log('orderList', orderList);
if (orderList.length == 0) {
return { orderList };
}
return { orderList };
}
/**

4
src/pages/raw/warehouse/rowScrap/config.ts
Unescape Escape View File

@ -34,6 +34,10 @@ export const headers = [
label: vm.$t('message.product_costCenter'),
key: 'costCenter',
},
{
label: vm.$t('message.DocumentNumber'),
key: 'fileNo',
},
// {
// label: '库存地点',
// key: 'wkposCode',

204
src/utils/page.ts
Unescape Escape View File

@ -1,171 +1,173 @@
export const page = {
index: {
index: "/pages/index/index",
index: '/pages/index/index',
},
demo: {
index: "/pages/demo/index",
index: '/pages/demo/index',
},
login: {
login: "/pages/login/login/index",
server: "/pages/login/server/index",
area: "/pages/login/area/index",
login: '/pages/login/login/index',
server: '/pages/login/server/index',
area: '/pages/login/area/index',
},
product: {
index: "/pages/product/index",
index: '/pages/product/index',
inbound: {
// index: '/pages/product/inbound/index',
// index2: '/pages/product/inbound/index2',
index3: "/pages/product/inbound/index3",
offlineIn: "/pages/product/inbound/offline-in/index",
finishProductOffline: "/pages/product/inbound/finishProductOffline/index",
index3: '/pages/product/inbound/index3',
offlineIn: '/pages/product/inbound/offline-in/index',
finishProductOffline: '/pages/product/inbound/finishProductOffline/index',
// semiFinishProductOfflineRefrigerator:
// '/pages/product/inbound/semiFinishProductOfflineRefrigerator/index',
semiFinishProductOffline2:
"/pages/product/inbound/semiFinishProductOffline2/index",
semiFinishProductOffline2: '/pages/product/inbound/semiFinishProductOffline2/index',
// semiFinishProductOnlineDoor: '/pages/product/inbound/semiFinishProductOnlineDoor/index',
// semiFinishProductOnlineBox: '/pages/product/inbound/semiFinishProductOnlineBox/index',
},
outbound: {
index: "/pages/product/outbound/index",
internal: "/pages/product/outbound/internal/index",
foreign: "/pages/product/outbound/foreign/index",
stoOutbound: "/pages/product/outbound/stoOutbound/index",
delivergoods: "/pages/product/outbound/stoOutbound/DN-delivergoods",
stoOutboundDetail: "/pages/product/outbound/stoOutbound/detail",
index: '/pages/product/outbound/index',
internal: '/pages/product/outbound/internal/index',
foreign: '/pages/product/outbound/foreign/index',
stoOutbound: '/pages/product/outbound/stoOutbound/index',
delivergoods: '/pages/product/outbound/stoOutbound/DN-delivergoods',
stoOutboundDetail: '/pages/product/outbound/stoOutbound/detail',
},
warehouse: {
index: "/pages/product/warehouse/index",
index: '/pages/product/warehouse/index',
wholeTransfer: {
index: "/pages/product/warehouse/wholeTransfer/index",
Local: "/pages/product/warehouse/wholeTransfer/Local-details",
index: '/pages/product/warehouse/wholeTransfer/index',
Local: '/pages/product/warehouse/wholeTransfer/Local-details',
},
wholeScrap: {
index: "/pages/product/warehouse/wholeScrap/index",
index: '/pages/product/warehouse/wholeScrap/index',
},
wholeCollect: {
index: "/pages/product/warehouse/wholeCollect/index",
index: '/pages/product/warehouse/wholeCollect/index',
},
MaterialInventory: {
index: '/pages/product/warehouse/MaterialInventory/index',
},
wholeLnventory: {
index: "/pages/product/warehouse/wholeLnventory/index",
index: '/pages/product/warehouse/wholeLnventory/index',
},
},
},
raw: {
index: "/pages/raw/index",
index: '/pages/raw/index',
appointment: {
index: "/pages/raw/appointment/index",
checkin: "/pages/raw/appointment/checkin/index",
checkinList: "/pages/raw/appointment/checkin/list",
checkout: "/pages/raw/appointment/checkout/index",
index: '/pages/raw/appointment/index',
checkin: '/pages/raw/appointment/checkin/index',
checkinList: '/pages/raw/appointment/checkin/list',
checkout: '/pages/raw/appointment/checkout/index',
},
handover: {
index: "/pages/raw/handover/index",
index: '/pages/raw/handover/index',
kanDan: {
index: "/pages/raw/handover/kan-dan/index",
details: "/pages/raw/handover/kan-dan/details",
index: '/pages/raw/handover/kan-dan/index',
details: '/pages/raw/handover/kan-dan/details',
},
picking: {
index: "/pages/raw/handover/picking/index",
result: "/pages/raw/handover/picking/result",
summary: "/pages/raw/handover/picking/summary",
bysummary: "/pages/raw/handover/picking/BySummary",
order: "/pages/raw/handover/picking/order",
idetailed: "/pages/raw/handover/picking/idetailed",
query: "/pages/raw/handover/picking/query",
total: "/pages/raw/handover/picking/total",
byorder: "/pages/raw/handover/picking/ByOrder",
Local: "/pages/raw/handover/picking/Local-details",
SummaryLocal: "/pages/raw/handover/picking/Summary-details",
index: '/pages/raw/handover/picking/index',
result: '/pages/raw/handover/picking/result',
summary: '/pages/raw/handover/picking/summary',
bysummary: '/pages/raw/handover/picking/BySummary',
order: '/pages/raw/handover/picking/order',
idetailed: '/pages/raw/handover/picking/idetailed',
query: '/pages/raw/handover/picking/query',
total: '/pages/raw/handover/picking/total',
byorder: '/pages/raw/handover/picking/ByOrder',
Local: '/pages/raw/handover/picking/Local-details',
SummaryLocal: '/pages/raw/handover/picking/Summary-details',
},
feeding: {
index: "/pages/raw/handover/feeding/index",
detail: "/pages/raw/handover/feeding/detail",
Location: "/pages/raw/handover/feeding/Location",
Local: "/pages/raw/handover/feeding/Local-details",
index: '/pages/raw/handover/feeding/index',
detail: '/pages/raw/handover/feeding/detail',
Location: '/pages/raw/handover/feeding/Location',
Local: '/pages/raw/handover/feeding/Local-details',
},
returning: {
index: "/pages/raw/handover/returning/index",
filter: "/pages/raw/handover/returning/Time-filter",
index: '/pages/raw/handover/returning/index',
filter: '/pages/raw/handover/returning/Time-filter',
},
aggregating: {
index: "/pages/raw/handover/aggregating/index",
result: "/pages/raw/handover/aggregating/result",
order: "/pages/raw/handover/aggregating/order",
summary: "/pages/raw/handover/aggregating/summary",
accessory: "/pages/raw/handover/aggregating/accessory",
index: '/pages/raw/handover/aggregating/index',
result: '/pages/raw/handover/aggregating/result',
order: '/pages/raw/handover/aggregating/order',
summary: '/pages/raw/handover/aggregating/summary',
accessory: '/pages/raw/handover/aggregating/accessory',
},
virtual: {
index: "/pages/raw/handover/virtual/index",
result: "/pages/raw/handover/virtual/result",
summary: "/pages/raw/handover/virtual/summary",
index: '/pages/raw/handover/virtual/index',
result: '/pages/raw/handover/virtual/result',
summary: '/pages/raw/handover/virtual/summary',
},
},
ingoods: {
index: "/pages/raw/ingoods/index",
index: '/pages/raw/ingoods/index',
receipt: {
index: "/pages/raw/ingoods/receipt/index",
detail: "/pages/raw/ingoods/receipt/detail",
detailEx: "/pages/raw/ingoods/receipt/detail-ex",
index: '/pages/raw/ingoods/receipt/index',
detail: '/pages/raw/ingoods/receipt/detail',
detailEx: '/pages/raw/ingoods/receipt/detail-ex',
},
poReceipt: {
index: "/pages/raw/ingoods/poReceipt/index",
detail: "/pages/raw/ingoods/poReceipt/detail",
detailEx: "/pages/raw/ingoods/poReceipt/detail-ex",
idetailed: "/pages/raw/ingoods/poReceipt/idetailed",
poReceiving: "/pages/raw/ingoods/poReceipt/poReceiving",
bill: "/pages/raw/ingoods/poReceipt/bill",
index: '/pages/raw/ingoods/poReceipt/index',
detail: '/pages/raw/ingoods/poReceipt/detail',
detailEx: '/pages/raw/ingoods/poReceipt/detail-ex',
idetailed: '/pages/raw/ingoods/poReceipt/idetailed',
poReceiving: '/pages/raw/ingoods/poReceipt/poReceiving',
bill: '/pages/raw/ingoods/poReceipt/bill',
},
dnReceipt: {
index: "/pages/raw/ingoods/dnReceipt/index",
detail: "/pages/raw/ingoods/dnReceipt/detail",
detailEx: "/pages/raw/ingoods/dnReceipt/detail-ex",
idetailed: "/pages/raw/ingoods/dnReceipt/idetailed",
dnReceiving: "/pages/raw/ingoods/dnReceipt/dnReceiving",
importDN: "/pages/raw/ingoods/dnReceipt/ImportDN",
bill: "/pages/raw/ingoods/dnReceipt/bill",
Local: "/pages/raw/ingoods/dnReceipt/Local-details",
index: '/pages/raw/ingoods/dnReceipt/index',
detail: '/pages/raw/ingoods/dnReceipt/detail',
detailEx: '/pages/raw/ingoods/dnReceipt/detail-ex',
idetailed: '/pages/raw/ingoods/dnReceipt/idetailed',
dnReceiving: '/pages/raw/ingoods/dnReceipt/dnReceiving',
importDN: '/pages/raw/ingoods/dnReceipt/ImportDN',
bill: '/pages/raw/ingoods/dnReceipt/bill',
Local: '/pages/raw/ingoods/dnReceipt/Local-details',
},
dnReturnGoods: {
index: "/pages/raw/ingoods/dnReturnGoods/index",
detail: "/pages/raw/ingoods/dnReturnGoods/detail",
location: "/pages/raw/ingoods/dnReturnGoods/Location",
Local: "/pages/raw/ingoods/dnReturnGoods/Local-details",
detailEx: "/pages/raw/ingoods/dnReturnGoods/detail-ex",
idetailed: "/pages/raw/ingoods/dnReturnGoods/idetailed",
index: '/pages/raw/ingoods/dnReturnGoods/index',
detail: '/pages/raw/ingoods/dnReturnGoods/detail',
location: '/pages/raw/ingoods/dnReturnGoods/Location',
Local: '/pages/raw/ingoods/dnReturnGoods/Local-details',
detailEx: '/pages/raw/ingoods/dnReturnGoods/detail-ex',
idetailed: '/pages/raw/ingoods/dnReturnGoods/idetailed',
},
},
warehouse: {
index: "/pages/raw/warehouse/index",
index: '/pages/raw/warehouse/index',
rowTransfer: {
index: "/pages/raw/warehouse/rowTransfer/index",
details: "/pages/raw/warehouse/rowTransfer/details",
index: '/pages/raw/warehouse/rowTransfer/index',
details: '/pages/raw/warehouse/rowTransfer/details',
},
rowScrap: {
index: "/pages/raw/warehouse/rowScrap/index",
details: "/pages/raw/warehouse/rowScrap/details",
index: '/pages/raw/warehouse/rowScrap/index',
details: '/pages/raw/warehouse/rowScrap/details',
},
rowCollect: {
index: "/pages/raw/warehouse/rowCollect/index",
details: "/pages/raw/warehouse/rowCollect/details",
index: '/pages/raw/warehouse/rowCollect/index',
details: '/pages/raw/warehouse/rowCollect/details',
},
rowInventory: {
index: "/pages/raw/warehouse/rowInventory/index",
index: '/pages/raw/warehouse/rowInventory/index',
},
},
commission: {
index: "/pages/raw/commission/index",
index: '/pages/raw/commission/index',
entrant: {
index: "/pages/raw/commission/entrant/index",
detail: "/pages/raw/commission/entrant/detail",
index: '/pages/raw/commission/entrant/index',
detail: '/pages/raw/commission/entrant/detail',
},
goOut: {
index: "/pages/raw/commission/goOut/index",
detail: "/pages/raw/commission/goOut/detail",
index: '/pages/raw/commission/goOut/index',
detail: '/pages/raw/commission/goOut/detail',
},
},
},
SemiProduct: {
index: "/pages/SemiProduct/index",
index: '/pages/SemiProduct/index',
// inbound: {
// index: '/pages/SemiProduct/inbound/index',
// index2: '/pages/SemiProduct/inbound/index2',
@ -175,20 +177,20 @@ export const page = {
// semiFinishProductOnlineBox: '/pages/SemiProduct/inbound/semiFinishProductOnlineBox/index',
// },
outbound: {
index: "/pages/SemiProduct/outbound/index",
index: '/pages/SemiProduct/outbound/index',
},
inbound: {
index: "/pages/SemiProduct/inbound/index",
index: '/pages/SemiProduct/inbound/index',
},
DumpList: {
index: "/pages/SemiProduct/DumpList/index",
index: '/pages/SemiProduct/DumpList/index',
DumpListFH: {
index: "/pages/SemiProduct/DumpList/DumpListFH/index",
detail: "/pages/SemiProduct/DumpList/DumpListFH/detail",
index: '/pages/SemiProduct/DumpList/DumpListFH/index',
detail: '/pages/SemiProduct/DumpList/DumpListFH/detail',
},
DumpListSH: {
index: "/pages/SemiProduct/DumpList/DumpListSH/index",
detail: "/pages/SemiProduct/DumpList/DumpListSH/detail",
index: '/pages/SemiProduct/DumpList/DumpListSH/index',
detail: '/pages/SemiProduct/DumpList/DumpListSH/detail',
},
},
},

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

@ -199,6 +199,11 @@ export const url = {
rowCollect: {
list: '/wmspda/fg/listByOrder',
},
MaterialInventory: {
list: '/wmspda/fg/findMaterialByPddNoWl',
content: '/wmspda/fg/inventoryUploadSn',
commit: '/wmspda/fg/completePd',
},
wholeTransfer: {
list: '/wmspda/fg/getMdLocation',
content: '/wmspda/fg/getMaterialByCode',

Write Preview
Loading…
Cancel
Save