cosmoim-852 fix 俄罗斯新增容器报废功能&半成品交接出库界面重做&其他功能优化
hou
3 years ago
parent
151e1cbe10
commit
1e6ee39bd4
@ -1,92 +1,150 @@
|
||||
import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
|
||||
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 vm from '@/main';
|
||||
// import { page } from '@/utils/page';
|
||||
|
||||
class OrderInInfo {
|
||||
checked?: boolean;
|
||||
poNo?: string;
|
||||
kw?: string;
|
||||
userDefined10?: string;
|
||||
orderStatus?: string;
|
||||
productDescZh?: string;
|
||||
qty?: string;
|
||||
custCode?: string;
|
||||
custCodeName?: string;
|
||||
productCode?: string;
|
||||
locCode?: string;
|
||||
barcode?: string;
|
||||
// actualQty?: string;
|
||||
}
|
||||
|
||||
@Module({
|
||||
namespaced: true,
|
||||
dynamic: true,
|
||||
store,
|
||||
name: 'Semi-finished-rowTransfer',
|
||||
name: 'product.Semi-finished-rowTransfer',
|
||||
})
|
||||
export class rowTransfer extends VuexModule {
|
||||
cboPlaceList = [];
|
||||
poNo = '';
|
||||
orderInInfo: OrderInInfo = new OrderInInfo();
|
||||
orderInInfoList: OrderInInfo[] = [];
|
||||
materielList = [];
|
||||
export class wholeTransfer extends VuexModule {
|
||||
/**
|
||||
* 库位地点列表
|
||||
*/
|
||||
WlList = [];
|
||||
userDefined: any = '';
|
||||
detailedList: any;
|
||||
code = '';
|
||||
delCode = '';
|
||||
removeList: any = [];
|
||||
removeMaterialList: any = [];
|
||||
dnNo = '';
|
||||
orderInInfo: OrderInInfo = new OrderInInfo();
|
||||
@MutationAction
|
||||
async takeYKOrder(order3: any) {
|
||||
const res: any = await http.post(url.warehouse.rowTransfer.listByOrder, {
|
||||
...order3,
|
||||
orderType: 'SFG',
|
||||
page: 1,
|
||||
rows: 50,
|
||||
async queryLocation() {
|
||||
const result: any = await http.get(url.warehouse.wholeTransfer.getMdLocationSfgLine, {
|
||||
params: {
|
||||
factoryCode: session.factoryCode,
|
||||
loginName: session.loginName,
|
||||
},
|
||||
});
|
||||
console.log('res', res);
|
||||
const code = res.code;
|
||||
const orderInInfoList = res.data.records;
|
||||
const materielList = orderInInfoList.map((item: any) => ({
|
||||
label: item.productCode,
|
||||
value: item.productCode,
|
||||
...item,
|
||||
console.log('库位数据', result);
|
||||
const WlList = result.data.map((_: any) => ({
|
||||
label: _.locationCode,
|
||||
value: _.locationCode,
|
||||
}));
|
||||
console.log('materielList', materielList);
|
||||
return { orderInInfoList, materielList, code };
|
||||
return { WlList };
|
||||
}
|
||||
SearchCode: any = '';
|
||||
SearchCodeList: any = '';
|
||||
|
||||
/**
|
||||
* 查询单号
|
||||
* 查询DN单号
|
||||
* @param dnNo
|
||||
*/
|
||||
@MutationAction
|
||||
async SearchBarcode(params: any) {
|
||||
const res: any = await http.post(url.warehouse.rowTransfer.getOdsRawStorageSnNew, {
|
||||
async getProductCode(barcode: any) {
|
||||
const res: any = await http.post(url.warehouse.wholeTransfer.getOdsRawStorageSnNew, {
|
||||
factoryCode: session.factoryCode,
|
||||
loginName: session.loginName,
|
||||
...params,
|
||||
barcode,
|
||||
});
|
||||
console.log('rrrrr', res);
|
||||
const SearchCode = res.code;
|
||||
const SearchCodeList = res.data;
|
||||
return { SearchCode, SearchCodeList };
|
||||
const code = res.code;
|
||||
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;
|
||||
}
|
||||
return { orderInInfo, code };
|
||||
}
|
||||
//退扫
|
||||
@MutationAction
|
||||
async codeDel(params: any) {
|
||||
const res: any = await http.post(url.warehouse.wholeTransfer.del, params);
|
||||
const delCode = res.code;
|
||||
return { delCode };
|
||||
}
|
||||
//清除数据
|
||||
@MutationAction
|
||||
async empty() {
|
||||
const orderInInfo: any = [];
|
||||
// const userDefined = '';
|
||||
// const WlList = [];
|
||||
const code = '';
|
||||
return { orderInInfo, code };
|
||||
}
|
||||
@MutationAction
|
||||
async onTakeoutConfirm(list: any) {
|
||||
const records: any = await http.post(url.warehouse.rowTransfer.commit, list);
|
||||
const records: any = await http.post(url.warehouse.rowTransfer.confirmMoveRussia, list);
|
||||
const code = records.code;
|
||||
return { code };
|
||||
}
|
||||
submitCode: any = '';
|
||||
//生成移库码
|
||||
@MutationAction
|
||||
async submit(submitList: any) {
|
||||
const res: any = await http.post(url.warehouse.rowTransfer.confirmMove, submitList);
|
||||
console.log(res);
|
||||
const submitCode = res.code;
|
||||
return { submitCode };
|
||||
async getCpMoveBatchNo(loginName: any) {
|
||||
const res: any = await http.post(url.warehouse.rowTransfer.getSfgMoveBatchNo, loginName);
|
||||
const userDefined: any = res.data;
|
||||
return { userDefined };
|
||||
}
|
||||
detailList: any = [];
|
||||
//查询已扫物料
|
||||
@MutationAction
|
||||
async queryDetail(proMoveCode: any) {
|
||||
const res = await http.post(url.warehouse.rowTransfer.queryListByMoveCode, {
|
||||
factoryCode: session.factoryCode,
|
||||
loginName: session.loginName,
|
||||
proMoveCode,
|
||||
async QueryHistory(params: any = {}) {
|
||||
const res: any = await http.post(url.warehouse.rowTransfer.queryGroupListByMoveCode, params);
|
||||
const removeList: any = res.data;
|
||||
const removeMaterialList: any = [];
|
||||
res.data.forEach((item: any) => {
|
||||
const arr: any = {
|
||||
value: item.materialCode,
|
||||
laber: item.materialCode,
|
||||
};
|
||||
removeMaterialList.push(arr);
|
||||
});
|
||||
const detailList = res.data;
|
||||
return { detailList };
|
||||
return { removeList, removeMaterialList };
|
||||
}
|
||||
@MutationAction
|
||||
async empty() {
|
||||
const materielList = null;
|
||||
return { materielList };
|
||||
//查询明细
|
||||
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
|
||||
async querydetaildlist(userDefined4: any) {
|
||||
const res: any = await http.post('/wmspda/fg/queryListByMoveCode', {
|
||||
loginName: session.loginName,
|
||||
factoryCode: session.factoryCode,
|
||||
proMoveCode: userDefined4,
|
||||
});
|
||||
console.log('明细》》》》》》》》》', res.list);
|
||||
this.detailedList = res.data;
|
||||
return res;
|
||||
}
|
||||
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
|
||||
async changeOrderInLocation(kw: string) {
|
||||
await http.post('/wmspda/material/orderin/enter', {
|
||||
loginName: session.loginName,
|
||||
// loginName: '1999',
|
||||
warehouseCode: '',
|
||||
factoryCode: session.factoryCode,
|
||||
// factoryCode: '1999',
|
||||
locationCode: kw,
|
||||
});
|
||||
return kw;
|
||||
}
|
||||
}
|
||||
export default getModule(rowTransfer);
|
||||
|
||||
export default getModule(wholeTransfer);
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
/**
|
||||
* 看单交接明细表格列
|
||||
*/
|
||||
import vm from '@/main';
|
||||
export const headers = [
|
||||
{
|
||||
label: vm.$t('message.Delivery'),
|
||||
key: 'proMoveCode', //单号
|
||||
width: 250,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.ModelCode'),
|
||||
key: 'materialCode', //型号编码
|
||||
width: 220,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.ModelName'),
|
||||
key: 'materialDesc', //型号名称
|
||||
width: 430,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.product_barCode'),
|
||||
key: 'barCode', //条码号
|
||||
width: 260,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.SourceLocation'),
|
||||
key: 'wlFromCode', //源库位
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.Warehouse_TargetLocation'),
|
||||
key: 'wlToCode', //目标库位
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.operatingTime'),
|
||||
key: 'moveTime', //操作时间
|
||||
width: 465,
|
||||
},
|
||||
];
|
||||
@ -0,0 +1,100 @@
|
||||
<template>
|
||||
<view class="page-kan-dan-detail">
|
||||
<view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
|
||||
<view class="left">
|
||||
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
|
||||
</view>
|
||||
<view class="title">{{ $t('message.Warehouse_TransferDetails') }}</view>
|
||||
<view class="right"></view>
|
||||
</view>
|
||||
<wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="headers" :contents="model.detailedList" :show-vert-border="false" />
|
||||
</view>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import { Component } from 'vue-property-decorator';
|
||||
import { BasePage } from '@/components/base/page';
|
||||
import model from './model';
|
||||
import { headers } from './config';
|
||||
@Component
|
||||
export default class KanDanHandOverDetails extends BasePage {
|
||||
order = '';
|
||||
headers = headers;
|
||||
model = model;
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.page-kan-dan-detail {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
.bottom-bar {
|
||||
z-index: 21;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
||||
.container {
|
||||
background: #ffffff;
|
||||
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
|
||||
padding: 20rpx;
|
||||
}
|
||||
|
||||
.extra {
|
||||
background-color: #fff;
|
||||
margin: 5px;
|
||||
border-radius: 5px;
|
||||
padding: 0 10px;
|
||||
}
|
||||
|
||||
.bottom-info {
|
||||
.u-form-item {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -0,0 +1,332 @@
|
||||
<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({})" />
|
||||
</view>
|
||||
<view class="title">{{ $t('message.SemiProductGetOutOfTheWarehouse') }}</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.Batch') }}</view>
|
||||
<u-search :placeholder="$t('message.batch')" class="Transfer" v-model.trim="userDefined4" @search="QueryHistory" :show-action="false"></u-search>
|
||||
</view>
|
||||
<view class="single-right">
|
||||
<u-button type="primary" style="height: 60rpx; width: 140rpx" @click="generate">{{ $t('message.generate') }}</u-button>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 总数 -->
|
||||
<u-form-item :label="$t('message.Warehouse_TotalNumber')">
|
||||
<u-input :disabled="true" v-model="allNum" placeholder="" />
|
||||
</u-form-item>
|
||||
<!-- 半成品编码 -->
|
||||
<u-form-item :label="$t('message.coding')">
|
||||
<jPicker sureColor="#ff0000" @bindpicker="selectItem" showKey="value" valKey="value" :val="remove.value" :options="model.removeMaterialList" />
|
||||
</u-form-item>
|
||||
<!-- 半成品描述 -->
|
||||
<u-form-item :label="$t('message.Description')">
|
||||
<u-input :disabled="true" v-model="histroyItem.materialDesc" placeholder="" style="overflow: hidden" />
|
||||
</u-form-item>
|
||||
<!-- 数量 -->
|
||||
<u-form-item :label="$t('message.product_Number')">
|
||||
<u-input :disabled="true" v-model="histroyItem.proNum" placeholder="" />
|
||||
</u-form-item>
|
||||
<!-- 条码 -->
|
||||
<u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
|
||||
<u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.productCode" @search="query" :show-action="false"></u-search>
|
||||
</u-form-item>
|
||||
<!-- 库位 -->
|
||||
<u-form-item :label="$t('message.product_Location')">
|
||||
<u-input :disabled="true" v-model="model.orderInInfo.locCode" placeholder="" />
|
||||
</u-form-item>
|
||||
<!-- 目标库位 -->
|
||||
<u-form-item :required="true" :label="$t('message.Warehouse_TargetLocation')" prop="aimWl">
|
||||
<jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.WlList" />
|
||||
</u-form-item>
|
||||
</u-form>
|
||||
<view class="bottom-bar">
|
||||
<u-row class="button-bar">
|
||||
<!-- 移库明细 -->
|
||||
<u-col :span="4">
|
||||
<u-button type="primary" @click="bill">{{ $t('message.detailed') }}</u-button>
|
||||
</u-col>
|
||||
<!-- 确定 -->
|
||||
<u-col :span="4">
|
||||
<u-button type="primary" @click="onSubmit">{{ $t('message.workArea_Confirm') }}</u-button>
|
||||
</u-col>
|
||||
<!-- 返回 -->
|
||||
<u-col :span="4">
|
||||
<u-button type="error" @click="uni.navigateBack({})">{{ $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 jPicker from '@/components/J-Picker/jPicker.vue';
|
||||
import { VForm, VFormRules } from 'vue/types/form';
|
||||
import model from './model';
|
||||
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 = {
|
||||
aimWl: {} as OptionType,
|
||||
productCode: '',
|
||||
};
|
||||
remove: any = {};
|
||||
allNum = 0;
|
||||
userDefined4: any = '';
|
||||
histroyItem: any = {};
|
||||
aimWlSelect = false;
|
||||
cboPlaceSelect = false;
|
||||
rules: VFormRules<any> = {
|
||||
documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') 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;
|
||||
//选择目标库位回调函数
|
||||
bookTypeChange(e: any) {
|
||||
this.form.aimWl = e.pickerName;
|
||||
}
|
||||
selectItem(e: any) {
|
||||
this.remove = e.pickerName;
|
||||
this.model.removeList.forEach((item: any) => {
|
||||
if (item.materialCode == this.remove.value) {
|
||||
this.histroyItem = item;
|
||||
console.log('this.histroyItem', this.histroyItem);
|
||||
}
|
||||
});
|
||||
}
|
||||
//扫描条码回车
|
||||
async query() {
|
||||
if (this.form.productCode == ' ' || this.form.productCode.length == 0) {
|
||||
this.customToast(this.$t('message.product_unit7') as string);
|
||||
return;
|
||||
}
|
||||
if (this.userDefined4 == '' || this.userDefined4.length == 0) {
|
||||
this.customToast(this.$t('message.Warehouse_Tip') as string);
|
||||
return;
|
||||
}
|
||||
await model.getProductCode(this.form.productCode);
|
||||
if (this.model.code == '1') {
|
||||
uni.showToast({
|
||||
//icon: 'success',
|
||||
title: this.$t('message.successful') as string,
|
||||
duration: 2000,
|
||||
image: '/static/icons/icon-51.png',
|
||||
});
|
||||
}
|
||||
}
|
||||
//查询已扫物料
|
||||
async QueryHistory() {
|
||||
if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
|
||||
this.customToast(this.$t('message.barcode') as string);
|
||||
return;
|
||||
}
|
||||
this.allNum = 0;
|
||||
let params = {
|
||||
loginName: session.loginName,
|
||||
factoryCode: session.factoryCode,
|
||||
proMoveCode: this.userDefined4,
|
||||
};
|
||||
await this.model.QueryHistory(params);
|
||||
this.model.removeList.forEach((item: any) => {
|
||||
this.allNum += parseFloat(item.proNum);
|
||||
});
|
||||
if (this.model.removeMaterialList.length == 0) {
|
||||
this.remove = {};
|
||||
this.histroyItem.proNum = 0;
|
||||
this.histroyItem.materialDesc = '';
|
||||
console.log('11111111111111111');
|
||||
console.log('this.histroyItem', this.histroyItem);
|
||||
} else {
|
||||
this.remove = this.model.removeMaterialList[0];
|
||||
this.model.removeList.forEach((item: any) => {
|
||||
if (item.materialCode == this.remove.value) {
|
||||
this.histroyItem = item;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
//页面初始化
|
||||
async onReady() {
|
||||
this.$form.setRules(this.rules);
|
||||
this.model.empty();
|
||||
await this.model.queryLocation();
|
||||
this.form.aimWl = this.model.WlList[0];
|
||||
}
|
||||
//点击生成随机移库码
|
||||
async generate() {
|
||||
await this.model.getCpMoveBatchNo({
|
||||
loginName: session.loginName,
|
||||
});
|
||||
this.userDefined4 = model.userDefined;
|
||||
}
|
||||
//移库明细
|
||||
async bill() {
|
||||
if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
|
||||
this.customToast(this.$t('message.LibraryCode') as string);
|
||||
return;
|
||||
}
|
||||
await this.model.querydetaildlist(this.userDefined4);
|
||||
this.toPage(this.page.raw.SemiFinished.SemiFinishedRowTcransfer.detail);
|
||||
}
|
||||
//移库确认
|
||||
onSubmit() {
|
||||
this.$form.validate(async (valid: boolean) => {
|
||||
if (!valid) return;
|
||||
if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
|
||||
this.customToast(this.$t('message.LibraryCode') as string);
|
||||
return;
|
||||
}
|
||||
if (!this.form.productCode) {
|
||||
this.customToast(this.$t('message.Warehouse_Tip5') as string);
|
||||
return;
|
||||
}
|
||||
if (!this.form.aimWl.value) {
|
||||
this.customToast(this.$t('message.Warehouse_Tip3') as string);
|
||||
return;
|
||||
}
|
||||
if (this.form.aimWl.value == model.orderInInfo.locCode) {
|
||||
this.customToast(this.$t('message.TargetLocation') as string);
|
||||
return;
|
||||
}
|
||||
const orderlist = [
|
||||
{
|
||||
...this.model.orderInInfo,
|
||||
originWl: this.model.orderInInfo.locCode,
|
||||
barCode: this.model.orderInInfo.barcode,
|
||||
aimWl: this.form.aimWl.value,
|
||||
type: '2',
|
||||
orderType: '5',
|
||||
keepBy: session.loginName as string,
|
||||
factoryCode: session.factoryCode as string,
|
||||
userDefined4: this.userDefined4,
|
||||
},
|
||||
];
|
||||
await this.model.onTakeoutConfirm(orderlist);
|
||||
if (model.code == '1') {
|
||||
this.customToast(this.$t('message.Warehouse_Tip9') as string);
|
||||
// this.form.productCode = '';
|
||||
this.model.empty();
|
||||
// this.query()
|
||||
this.form.productCode = '';
|
||||
this.allNum = 0;
|
||||
this.QueryHistory();
|
||||
// setTimeout(() => {
|
||||
// this.$forceUpdate();
|
||||
// }, 2000);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
</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;
|
||||
.Transfer {
|
||||
width: 280rpx;
|
||||
height: 64rpx;
|
||||
background: rgb(242, 242, 242);
|
||||
border-radius: 110rpx;
|
||||
}
|
||||
}
|
||||
.single {
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
display: flex;
|
||||
.single-left {
|
||||
width: 80%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
view {
|
||||
width: 170rpx;
|
||||
height: 100%;
|
||||
line-height: 100rpx;
|
||||
}
|
||||
}
|
||||
.single-right {
|
||||
button {
|
||||
margin-top: 15rpx;
|
||||
width: 140rpx;
|
||||
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>
|
||||
@ -0,0 +1,150 @@
|
||||
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 vm from '@/main';
|
||||
// import { page } from '@/utils/page';
|
||||
|
||||
class OrderInInfo {
|
||||
productDescZh?: string;
|
||||
qty?: string;
|
||||
custCode?: string;
|
||||
custCodeName?: string;
|
||||
productCode?: string;
|
||||
locCode?: string;
|
||||
barcode?: string;
|
||||
// actualQty?: string;
|
||||
}
|
||||
|
||||
@Module({
|
||||
namespaced: true,
|
||||
dynamic: true,
|
||||
store,
|
||||
name: 'product.Semi-finished-rowTransfer',
|
||||
})
|
||||
export class wholeTransfer extends VuexModule {
|
||||
/**
|
||||
* 库位地点列表
|
||||
*/
|
||||
WlList = [];
|
||||
userDefined: any = '';
|
||||
detailedList: any;
|
||||
code = '';
|
||||
delCode = '';
|
||||
removeList: any = [];
|
||||
removeMaterialList: any = [];
|
||||
dnNo = '';
|
||||
orderInInfo: OrderInInfo = new OrderInInfo();
|
||||
@MutationAction
|
||||
async queryLocation() {
|
||||
const result: any = await http.get(url.warehouse.wholeTransfer.getMdLocationSfgLine, {
|
||||
params: {
|
||||
factoryCode: session.factoryCode,
|
||||
loginName: session.loginName,
|
||||
},
|
||||
});
|
||||
console.log('库位数据', result);
|
||||
const WlList = result.data.map((_: any) => ({
|
||||
label: _.locationCode,
|
||||
value: _.locationCode,
|
||||
}));
|
||||
return { WlList };
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单号
|
||||
* 查询DN单号
|
||||
* @param dnNo
|
||||
*/
|
||||
@MutationAction
|
||||
async getProductCode(barcode: any) {
|
||||
const res: any = await http.post(url.warehouse.wholeTransfer.getOdsRawStorageSnNew, {
|
||||
factoryCode: session.factoryCode,
|
||||
loginName: session.loginName,
|
||||
barcode,
|
||||
});
|
||||
const code = res.code;
|
||||
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;
|
||||
}
|
||||
return { orderInInfo, code };
|
||||
}
|
||||
//退扫
|
||||
@MutationAction
|
||||
async codeDel(params: any) {
|
||||
const res: any = await http.post(url.warehouse.wholeTransfer.del, params);
|
||||
const delCode = res.code;
|
||||
return { delCode };
|
||||
}
|
||||
//清除数据
|
||||
@MutationAction
|
||||
async empty() {
|
||||
const orderInInfo: any = [];
|
||||
// const userDefined = '';
|
||||
// const WlList = [];
|
||||
const code = '';
|
||||
return { orderInInfo, code };
|
||||
}
|
||||
@MutationAction
|
||||
async onTakeoutConfirm(list: any) {
|
||||
const records: any = await http.post(url.warehouse.rowTransfer.confirmMoveRussia, list);
|
||||
const code = records.code;
|
||||
return { code };
|
||||
}
|
||||
//生成移库码
|
||||
@MutationAction
|
||||
async getCpMoveBatchNo(loginName: any) {
|
||||
const res: any = await http.post(url.warehouse.rowTransfer.getSfgMoveBatchNo, loginName);
|
||||
const userDefined: any = res.data;
|
||||
return { userDefined };
|
||||
}
|
||||
//查询已扫物料
|
||||
@MutationAction
|
||||
async QueryHistory(params: any = {}) {
|
||||
const res: any = await http.post(url.warehouse.rowTransfer.queryGroupListByMoveCode, params);
|
||||
const removeList: any = res.data;
|
||||
const removeMaterialList: any = [];
|
||||
res.data.forEach((item: any) => {
|
||||
const arr: any = {
|
||||
value: item.materialCode,
|
||||
laber: item.materialCode,
|
||||
};
|
||||
removeMaterialList.push(arr);
|
||||
});
|
||||
return { removeList, removeMaterialList };
|
||||
}
|
||||
//查询明细
|
||||
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
|
||||
async querydetaildlist(userDefined4: any) {
|
||||
const res: any = await http.post('/wmspda/fg/queryListByMoveCode', {
|
||||
loginName: session.loginName,
|
||||
factoryCode: session.factoryCode,
|
||||
proMoveCode: userDefined4,
|
||||
});
|
||||
console.log('明细》》》》》》》》》', res.list);
|
||||
this.detailedList = res.data;
|
||||
return res;
|
||||
}
|
||||
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
|
||||
async changeOrderInLocation(kw: string) {
|
||||
await http.post('/wmspda/material/orderin/enter', {
|
||||
loginName: session.loginName,
|
||||
// loginName: '1999',
|
||||
warehouseCode: '',
|
||||
factoryCode: session.factoryCode,
|
||||
// factoryCode: '1999',
|
||||
locationCode: kw,
|
||||
});
|
||||
return kw;
|
||||
}
|
||||
}
|
||||
|
||||
export default getModule(wholeTransfer);
|
||||
@ -0,0 +1,39 @@
|
||||
/**
|
||||
* 看单交接明细表格列
|
||||
*/
|
||||
import vm from '@/main';
|
||||
export const headers = [
|
||||
{
|
||||
label: vm.$t('message.Delivery'),
|
||||
key: 'proMoveCode', //单号
|
||||
width: 250,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.ModelCode'),
|
||||
key: 'materialCode', //型号编码
|
||||
width: 220,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.ModelName'),
|
||||
key: 'materialDesc', //型号名称
|
||||
width: 430,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.product_barCode'),
|
||||
key: 'barCode', //条码号
|
||||
width: 260,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.SourceLocation'),
|
||||
key: 'wlFromCode', //源库位
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.Warehouse_TargetLocation'),
|
||||
key: 'wlToCode', //目标库位
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.operatingTime'),
|
||||
key: 'moveTime', //操作时间
|
||||
width: 465,
|
||||
},
|
||||
];
|
||||
@ -0,0 +1,100 @@
|
||||
<template>
|
||||
<view class="page-kan-dan-detail">
|
||||
<view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
|
||||
<view class="left">
|
||||
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
|
||||
</view>
|
||||
<view class="title">{{ $t('message.Warehouse_TransferDetails') }}</view>
|
||||
<view class="right"></view>
|
||||
</view>
|
||||
<wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="headers" :contents="model.detailedList" :show-vert-border="false" />
|
||||
</view>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import { Component } from 'vue-property-decorator';
|
||||
import { BasePage } from '@/components/base/page';
|
||||
import model from './model';
|
||||
import { headers } from './config';
|
||||
@Component
|
||||
export default class KanDanHandOverDetails extends BasePage {
|
||||
order = '';
|
||||
headers = headers;
|
||||
model = model;
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.page-kan-dan-detail {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
.bottom-bar {
|
||||
z-index: 21;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
||||
.container {
|
||||
background: #ffffff;
|
||||
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
|
||||
padding: 20rpx;
|
||||
}
|
||||
|
||||
.extra {
|
||||
background-color: #fff;
|
||||
margin: 5px;
|
||||
border-radius: 5px;
|
||||
padding: 0 10px;
|
||||
}
|
||||
|
||||
.bottom-info {
|
||||
.u-form-item {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -0,0 +1,332 @@
|
||||
<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({})" />
|
||||
</view>
|
||||
<view class="title">{{ $t('message.SemiProductGetOutOfTheWarehouse') }}</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.Batch') }}</view>
|
||||
<u-search :placeholder="$t('message.batch')" class="Transfer" v-model.trim="userDefined4" @search="QueryHistory" :show-action="false"></u-search>
|
||||
</view>
|
||||
<view class="single-right">
|
||||
<u-button type="primary" style="height: 60rpx; width: 140rpx" @click="generate">{{ $t('message.generate') }}</u-button>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 总数 -->
|
||||
<u-form-item :label="$t('message.Warehouse_TotalNumber')">
|
||||
<u-input :disabled="true" v-model="allNum" placeholder="" />
|
||||
</u-form-item>
|
||||
<!-- 半成品编码 -->
|
||||
<u-form-item :label="$t('message.coding')">
|
||||
<jPicker sureColor="#ff0000" @bindpicker="selectItem" showKey="value" valKey="value" :val="remove.value" :options="model.removeMaterialList" />
|
||||
</u-form-item>
|
||||
<!-- 半成品描述 -->
|
||||
<u-form-item :label="$t('message.Description')">
|
||||
<u-input :disabled="true" v-model="histroyItem.materialDesc" placeholder="" style="overflow: hidden" />
|
||||
</u-form-item>
|
||||
<!-- 数量 -->
|
||||
<u-form-item :label="$t('message.product_Number')">
|
||||
<u-input :disabled="true" v-model="histroyItem.proNum" placeholder="" />
|
||||
</u-form-item>
|
||||
<!-- 条码 -->
|
||||
<u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
|
||||
<u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.productCode" @search="query" :show-action="false"></u-search>
|
||||
</u-form-item>
|
||||
<!-- 库位 -->
|
||||
<u-form-item :label="$t('message.product_Location')">
|
||||
<u-input :disabled="true" v-model="model.orderInInfo.locCode" placeholder="" />
|
||||
</u-form-item>
|
||||
<!-- 目标库位 -->
|
||||
<u-form-item :required="true" :label="$t('message.Warehouse_TargetLocation')" prop="aimWl">
|
||||
<jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.WlList" />
|
||||
</u-form-item>
|
||||
</u-form>
|
||||
<view class="bottom-bar">
|
||||
<u-row class="button-bar">
|
||||
<!-- 移库明细 -->
|
||||
<u-col :span="4">
|
||||
<u-button type="primary" @click="bill">{{ $t('message.detailed') }}</u-button>
|
||||
</u-col>
|
||||
<!-- 确定 -->
|
||||
<u-col :span="4">
|
||||
<u-button type="primary" @click="onSubmit">{{ $t('message.workArea_Confirm') }}</u-button>
|
||||
</u-col>
|
||||
<!-- 返回 -->
|
||||
<u-col :span="4">
|
||||
<u-button type="error" @click="uni.navigateBack({})">{{ $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 jPicker from '@/components/J-Picker/jPicker.vue';
|
||||
import { VForm, VFormRules } from 'vue/types/form';
|
||||
import model from './model';
|
||||
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 = {
|
||||
aimWl: {} as OptionType,
|
||||
productCode: '',
|
||||
};
|
||||
remove: any = {};
|
||||
allNum = 0;
|
||||
userDefined4: any = '';
|
||||
histroyItem: any = {};
|
||||
aimWlSelect = false;
|
||||
cboPlaceSelect = false;
|
||||
rules: VFormRules<any> = {
|
||||
documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') 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;
|
||||
//选择目标库位回调函数
|
||||
bookTypeChange(e: any) {
|
||||
this.form.aimWl = e.pickerName;
|
||||
}
|
||||
selectItem(e: any) {
|
||||
this.remove = e.pickerName;
|
||||
this.model.removeList.forEach((item: any) => {
|
||||
if (item.materialCode == this.remove.value) {
|
||||
this.histroyItem = item;
|
||||
console.log('this.histroyItem', this.histroyItem);
|
||||
}
|
||||
});
|
||||
}
|
||||
//扫描条码回车
|
||||
async query() {
|
||||
if (this.form.productCode == ' ' || this.form.productCode.length == 0) {
|
||||
this.customToast(this.$t('message.product_unit7') as string);
|
||||
return;
|
||||
}
|
||||
if (this.userDefined4 == '' || this.userDefined4.length == 0) {
|
||||
this.customToast(this.$t('message.Warehouse_Tip') as string);
|
||||
return;
|
||||
}
|
||||
await model.getProductCode(this.form.productCode);
|
||||
if (this.model.code == '1') {
|
||||
uni.showToast({
|
||||
//icon: 'success',
|
||||
title: this.$t('message.successful') as string,
|
||||
duration: 2000,
|
||||
image: '/static/icons/icon-51.png',
|
||||
});
|
||||
}
|
||||
}
|
||||
//查询已扫物料
|
||||
async QueryHistory() {
|
||||
if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
|
||||
this.customToast(this.$t('message.barcode') as string);
|
||||
return;
|
||||
}
|
||||
this.allNum = 0;
|
||||
let params = {
|
||||
loginName: session.loginName,
|
||||
factoryCode: session.factoryCode,
|
||||
proMoveCode: this.userDefined4,
|
||||
};
|
||||
await this.model.QueryHistory(params);
|
||||
this.model.removeList.forEach((item: any) => {
|
||||
this.allNum += parseFloat(item.proNum);
|
||||
});
|
||||
if (this.model.removeMaterialList.length == 0) {
|
||||
this.remove = {};
|
||||
this.histroyItem.proNum = 0;
|
||||
this.histroyItem.materialDesc = '';
|
||||
console.log('11111111111111111');
|
||||
console.log('this.histroyItem', this.histroyItem);
|
||||
} else {
|
||||
this.remove = this.model.removeMaterialList[0];
|
||||
this.model.removeList.forEach((item: any) => {
|
||||
if (item.materialCode == this.remove.value) {
|
||||
this.histroyItem = item;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
//页面初始化
|
||||
async onReady() {
|
||||
this.$form.setRules(this.rules);
|
||||
this.model.empty();
|
||||
await this.model.queryLocation();
|
||||
this.form.aimWl = this.model.WlList[0];
|
||||
}
|
||||
//点击生成随机移库码
|
||||
async generate() {
|
||||
await this.model.getCpMoveBatchNo({
|
||||
loginName: session.loginName,
|
||||
});
|
||||
this.userDefined4 = model.userDefined;
|
||||
}
|
||||
//移库明细
|
||||
async bill() {
|
||||
if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
|
||||
this.customToast(this.$t('message.LibraryCode') as string);
|
||||
return;
|
||||
}
|
||||
await this.model.querydetaildlist(this.userDefined4);
|
||||
this.toPage(this.page.raw.SemiFinished.SemiFinishedRowTcransfer.detail);
|
||||
}
|
||||
//移库确认
|
||||
onSubmit() {
|
||||
this.$form.validate(async (valid: boolean) => {
|
||||
if (!valid) return;
|
||||
if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
|
||||
this.customToast(this.$t('message.LibraryCode') as string);
|
||||
return;
|
||||
}
|
||||
if (!this.form.productCode) {
|
||||
this.customToast(this.$t('message.Warehouse_Tip5') as string);
|
||||
return;
|
||||
}
|
||||
if (!this.form.aimWl.value) {
|
||||
this.customToast(this.$t('message.Warehouse_Tip3') as string);
|
||||
return;
|
||||
}
|
||||
if (this.form.aimWl.value == model.orderInInfo.locCode) {
|
||||
this.customToast(this.$t('message.TargetLocation') as string);
|
||||
return;
|
||||
}
|
||||
const orderlist = [
|
||||
{
|
||||
...this.model.orderInInfo,
|
||||
originWl: this.model.orderInInfo.locCode,
|
||||
barCode: this.model.orderInInfo.barcode,
|
||||
aimWl: this.form.aimWl.value,
|
||||
type: '2',
|
||||
orderType: '5',
|
||||
keepBy: session.loginName as string,
|
||||
factoryCode: session.factoryCode as string,
|
||||
userDefined4: this.userDefined4,
|
||||
},
|
||||
];
|
||||
await this.model.onTakeoutConfirm(orderlist);
|
||||
if (model.code == '1') {
|
||||
this.customToast(this.$t('message.Warehouse_Tip9') as string);
|
||||
// this.form.productCode = '';
|
||||
this.model.empty();
|
||||
// this.query()
|
||||
this.form.productCode = '';
|
||||
this.allNum = 0;
|
||||
this.QueryHistory();
|
||||
// setTimeout(() => {
|
||||
// this.$forceUpdate();
|
||||
// }, 2000);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
</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;
|
||||
.Transfer {
|
||||
width: 280rpx;
|
||||
height: 64rpx;
|
||||
background: rgb(242, 242, 242);
|
||||
border-radius: 110rpx;
|
||||
}
|
||||
}
|
||||
.single {
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
display: flex;
|
||||
.single-left {
|
||||
width: 80%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
view {
|
||||
width: 170rpx;
|
||||
height: 100%;
|
||||
line-height: 100rpx;
|
||||
}
|
||||
}
|
||||
.single-right {
|
||||
button {
|
||||
margin-top: 15rpx;
|
||||
width: 140rpx;
|
||||
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>
|
||||
@ -0,0 +1,150 @@
|
||||
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 vm from '@/main';
|
||||
// import { page } from '@/utils/page';
|
||||
|
||||
class OrderInInfo {
|
||||
productDescZh?: string;
|
||||
qty?: string;
|
||||
custCode?: string;
|
||||
custCodeName?: string;
|
||||
productCode?: string;
|
||||
locCode?: string;
|
||||
barcode?: string;
|
||||
// actualQty?: string;
|
||||
}
|
||||
|
||||
@Module({
|
||||
namespaced: true,
|
||||
dynamic: true,
|
||||
store,
|
||||
name: 'product.Semi-finished-rowTransfer',
|
||||
})
|
||||
export class wholeTransfer extends VuexModule {
|
||||
/**
|
||||
* 库位地点列表
|
||||
*/
|
||||
WlList = [];
|
||||
userDefined: any = '';
|
||||
detailedList: any;
|
||||
code = '';
|
||||
delCode = '';
|
||||
removeList: any = [];
|
||||
removeMaterialList: any = [];
|
||||
dnNo = '';
|
||||
orderInInfo: OrderInInfo = new OrderInInfo();
|
||||
@MutationAction
|
||||
async queryLocation() {
|
||||
const result: any = await http.get(url.warehouse.wholeTransfer.getMdLocationSfgLine, {
|
||||
params: {
|
||||
factoryCode: session.factoryCode,
|
||||
loginName: session.loginName,
|
||||
},
|
||||
});
|
||||
console.log('库位数据', result);
|
||||
const WlList = result.data.map((_: any) => ({
|
||||
label: _.locationCode,
|
||||
value: _.locationCode,
|
||||
}));
|
||||
return { WlList };
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单号
|
||||
* 查询DN单号
|
||||
* @param dnNo
|
||||
*/
|
||||
@MutationAction
|
||||
async getProductCode(barcode: any) {
|
||||
const res: any = await http.post(url.warehouse.wholeTransfer.getOdsRawStorageSnNew, {
|
||||
factoryCode: session.factoryCode,
|
||||
loginName: session.loginName,
|
||||
barcode,
|
||||
});
|
||||
const code = res.code;
|
||||
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;
|
||||
}
|
||||
return { orderInInfo, code };
|
||||
}
|
||||
//退扫
|
||||
@MutationAction
|
||||
async codeDel(params: any) {
|
||||
const res: any = await http.post(url.warehouse.wholeTransfer.del, params);
|
||||
const delCode = res.code;
|
||||
return { delCode };
|
||||
}
|
||||
//清除数据
|
||||
@MutationAction
|
||||
async empty() {
|
||||
const orderInInfo: any = [];
|
||||
// const userDefined = '';
|
||||
// const WlList = [];
|
||||
const code = '';
|
||||
return { orderInInfo, code };
|
||||
}
|
||||
@MutationAction
|
||||
async onTakeoutConfirm(list: any) {
|
||||
const records: any = await http.post(url.warehouse.rowTransfer.confirmMoveRussia, list);
|
||||
const code = records.code;
|
||||
return { code };
|
||||
}
|
||||
//生成移库码
|
||||
@MutationAction
|
||||
async getCpMoveBatchNo(loginName: any) {
|
||||
const res: any = await http.post(url.warehouse.rowTransfer.getSfgMoveBatchNo, loginName);
|
||||
const userDefined: any = res.data;
|
||||
return { userDefined };
|
||||
}
|
||||
//查询已扫物料
|
||||
@MutationAction
|
||||
async QueryHistory(params: any = {}) {
|
||||
const res: any = await http.post(url.warehouse.rowTransfer.queryGroupListByMoveCode, params);
|
||||
const removeList: any = res.data;
|
||||
const removeMaterialList: any = [];
|
||||
res.data.forEach((item: any) => {
|
||||
const arr: any = {
|
||||
value: item.materialCode,
|
||||
laber: item.materialCode,
|
||||
};
|
||||
removeMaterialList.push(arr);
|
||||
});
|
||||
return { removeList, removeMaterialList };
|
||||
}
|
||||
//查询明细
|
||||
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
|
||||
async querydetaildlist(userDefined4: any) {
|
||||
const res: any = await http.post('/wmspda/fg/queryListByMoveCode', {
|
||||
loginName: session.loginName,
|
||||
factoryCode: session.factoryCode,
|
||||
proMoveCode: userDefined4,
|
||||
});
|
||||
console.log('明细》》》》》》》》》', res.list);
|
||||
this.detailedList = res.data;
|
||||
return res;
|
||||
}
|
||||
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
|
||||
async changeOrderInLocation(kw: string) {
|
||||
await http.post('/wmspda/material/orderin/enter', {
|
||||
loginName: session.loginName,
|
||||
// loginName: '1999',
|
||||
warehouseCode: '',
|
||||
factoryCode: session.factoryCode,
|
||||
// factoryCode: '1999',
|
||||
locationCode: kw,
|
||||
});
|
||||
return kw;
|
||||
}
|
||||
}
|
||||
|
||||
export default getModule(wholeTransfer);
|
||||
@ -0,0 +1,39 @@
|
||||
/**
|
||||
* 看单交接明细表格列
|
||||
*/
|
||||
import vm from '@/main';
|
||||
export const headers = [
|
||||
{
|
||||
label: vm.$t('message.Delivery'),
|
||||
key: 'proMoveCode', //单号
|
||||
width: 250,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.ModelCode'),
|
||||
key: 'materialCode', //型号编码
|
||||
width: 220,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.ModelName'),
|
||||
key: 'materialDesc', //型号名称
|
||||
width: 430,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.product_barCode'),
|
||||
key: 'barCode', //条码号
|
||||
width: 260,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.SourceLocation'),
|
||||
key: 'wlFromCode', //源库位
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.Warehouse_TargetLocation'),
|
||||
key: 'wlToCode', //目标库位
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.operatingTime'),
|
||||
key: 'moveTime', //操作时间
|
||||
width: 465,
|
||||
},
|
||||
];
|
||||
@ -0,0 +1,100 @@
|
||||
<template>
|
||||
<view class="page-kan-dan-detail">
|
||||
<view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
|
||||
<view class="left">
|
||||
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
|
||||
</view>
|
||||
<view class="title">{{ $t('message.Warehouse_TransferDetails') }}</view>
|
||||
<view class="right"></view>
|
||||
</view>
|
||||
<wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="headers" :contents="model.detailedList" :show-vert-border="false" />
|
||||
</view>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import { Component } from 'vue-property-decorator';
|
||||
import { BasePage } from '@/components/base/page';
|
||||
import model from './model';
|
||||
import { headers } from './config';
|
||||
@Component
|
||||
export default class KanDanHandOverDetails extends BasePage {
|
||||
order = '';
|
||||
headers = headers;
|
||||
model = model;
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.page-kan-dan-detail {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
.bottom-bar {
|
||||
z-index: 21;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
||||
.container {
|
||||
background: #ffffff;
|
||||
box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2);
|
||||
padding: 20rpx;
|
||||
}
|
||||
|
||||
.extra {
|
||||
background-color: #fff;
|
||||
margin: 5px;
|
||||
border-radius: 5px;
|
||||
padding: 0 10px;
|
||||
}
|
||||
|
||||
.bottom-info {
|
||||
.u-form-item {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -0,0 +1,332 @@
|
||||
<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({})" />
|
||||
</view>
|
||||
<view class="title">{{ $t('message.SemiProductGetOutOfTheWarehouse') }}</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.Batch') }}</view>
|
||||
<u-search :placeholder="$t('message.batch')" class="Transfer" v-model.trim="userDefined4" @search="QueryHistory" :show-action="false"></u-search>
|
||||
</view>
|
||||
<view class="single-right">
|
||||
<u-button type="primary" style="height: 60rpx; width: 140rpx" @click="generate">{{ $t('message.generate') }}</u-button>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 总数 -->
|
||||
<u-form-item :label="$t('message.Warehouse_TotalNumber')">
|
||||
<u-input :disabled="true" v-model="allNum" placeholder="" />
|
||||
</u-form-item>
|
||||
<!-- 半成品编码 -->
|
||||
<u-form-item :label="$t('message.coding')">
|
||||
<jPicker sureColor="#ff0000" @bindpicker="selectItem" showKey="value" valKey="value" :val="remove.value" :options="model.removeMaterialList" />
|
||||
</u-form-item>
|
||||
<!-- 半成品描述 -->
|
||||
<u-form-item :label="$t('message.Description')">
|
||||
<u-input :disabled="true" v-model="histroyItem.materialDesc" placeholder="" style="overflow: hidden" />
|
||||
</u-form-item>
|
||||
<!-- 数量 -->
|
||||
<u-form-item :label="$t('message.product_Number')">
|
||||
<u-input :disabled="true" v-model="histroyItem.proNum" placeholder="" />
|
||||
</u-form-item>
|
||||
<!-- 条码 -->
|
||||
<u-form-item :required="true" :label="$t('message.product_barCode')" prop="productCode">
|
||||
<u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.productCode" @search="query" :show-action="false"></u-search>
|
||||
</u-form-item>
|
||||
<!-- 库位 -->
|
||||
<u-form-item :label="$t('message.product_Location')">
|
||||
<u-input :disabled="true" v-model="model.orderInInfo.locCode" placeholder="" />
|
||||
</u-form-item>
|
||||
<!-- 目标库位 -->
|
||||
<u-form-item :required="true" :label="$t('message.Warehouse_TargetLocation')" prop="aimWl">
|
||||
<jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.WlList" />
|
||||
</u-form-item>
|
||||
</u-form>
|
||||
<view class="bottom-bar">
|
||||
<u-row class="button-bar">
|
||||
<!-- 移库明细 -->
|
||||
<u-col :span="4">
|
||||
<u-button type="primary" @click="bill">{{ $t('message.detailed') }}</u-button>
|
||||
</u-col>
|
||||
<!-- 确定 -->
|
||||
<u-col :span="4">
|
||||
<u-button type="primary" @click="onSubmit">{{ $t('message.workArea_Confirm') }}</u-button>
|
||||
</u-col>
|
||||
<!-- 返回 -->
|
||||
<u-col :span="4">
|
||||
<u-button type="error" @click="uni.navigateBack({})">{{ $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 jPicker from '@/components/J-Picker/jPicker.vue';
|
||||
import { VForm, VFormRules } from 'vue/types/form';
|
||||
import model from './model';
|
||||
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 = {
|
||||
aimWl: {} as OptionType,
|
||||
productCode: '',
|
||||
};
|
||||
remove: any = {};
|
||||
allNum = 0;
|
||||
userDefined4: any = '';
|
||||
histroyItem: any = {};
|
||||
aimWlSelect = false;
|
||||
cboPlaceSelect = false;
|
||||
rules: VFormRules<any> = {
|
||||
documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') 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;
|
||||
//选择目标库位回调函数
|
||||
bookTypeChange(e: any) {
|
||||
this.form.aimWl = e.pickerName;
|
||||
}
|
||||
selectItem(e: any) {
|
||||
this.remove = e.pickerName;
|
||||
this.model.removeList.forEach((item: any) => {
|
||||
if (item.materialCode == this.remove.value) {
|
||||
this.histroyItem = item;
|
||||
console.log('this.histroyItem', this.histroyItem);
|
||||
}
|
||||
});
|
||||
}
|
||||
//扫描条码回车
|
||||
async query() {
|
||||
if (this.form.productCode == ' ' || this.form.productCode.length == 0) {
|
||||
this.customToast(this.$t('message.product_unit7') as string);
|
||||
return;
|
||||
}
|
||||
if (this.userDefined4 == '' || this.userDefined4.length == 0) {
|
||||
this.customToast(this.$t('message.Warehouse_Tip') as string);
|
||||
return;
|
||||
}
|
||||
await model.getProductCode(this.form.productCode);
|
||||
if (this.model.code == '1') {
|
||||
uni.showToast({
|
||||
//icon: 'success',
|
||||
title: this.$t('message.successful') as string,
|
||||
duration: 2000,
|
||||
image: '/static/icons/icon-51.png',
|
||||
});
|
||||
}
|
||||
}
|
||||
//查询已扫物料
|
||||
async QueryHistory() {
|
||||
if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
|
||||
this.customToast(this.$t('message.barcode') as string);
|
||||
return;
|
||||
}
|
||||
this.allNum = 0;
|
||||
let params = {
|
||||
loginName: session.loginName,
|
||||
factoryCode: session.factoryCode,
|
||||
proMoveCode: this.userDefined4,
|
||||
};
|
||||
await this.model.QueryHistory(params);
|
||||
this.model.removeList.forEach((item: any) => {
|
||||
this.allNum += parseFloat(item.proNum);
|
||||
});
|
||||
if (this.model.removeMaterialList.length == 0) {
|
||||
this.remove = {};
|
||||
this.histroyItem.proNum = 0;
|
||||
this.histroyItem.materialDesc = '';
|
||||
console.log('11111111111111111');
|
||||
console.log('this.histroyItem', this.histroyItem);
|
||||
} else {
|
||||
this.remove = this.model.removeMaterialList[0];
|
||||
this.model.removeList.forEach((item: any) => {
|
||||
if (item.materialCode == this.remove.value) {
|
||||
this.histroyItem = item;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
//页面初始化
|
||||
async onReady() {
|
||||
this.$form.setRules(this.rules);
|
||||
this.model.empty();
|
||||
await this.model.queryLocation();
|
||||
this.form.aimWl = this.model.WlList[0];
|
||||
}
|
||||
//点击生成随机移库码
|
||||
async generate() {
|
||||
await this.model.getCpMoveBatchNo({
|
||||
loginName: session.loginName,
|
||||
});
|
||||
this.userDefined4 = model.userDefined;
|
||||
}
|
||||
//移库明细
|
||||
async bill() {
|
||||
if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
|
||||
this.customToast(this.$t('message.LibraryCode') as string);
|
||||
return;
|
||||
}
|
||||
await this.model.querydetaildlist(this.userDefined4);
|
||||
this.toPage(this.page.raw.SemiFinished.SemiFinishedRowTcransfer.detail);
|
||||
}
|
||||
//移库确认
|
||||
onSubmit() {
|
||||
this.$form.validate(async (valid: boolean) => {
|
||||
if (!valid) return;
|
||||
if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
|
||||
this.customToast(this.$t('message.LibraryCode') as string);
|
||||
return;
|
||||
}
|
||||
if (!this.form.productCode) {
|
||||
this.customToast(this.$t('message.Warehouse_Tip5') as string);
|
||||
return;
|
||||
}
|
||||
if (!this.form.aimWl.value) {
|
||||
this.customToast(this.$t('message.Warehouse_Tip3') as string);
|
||||
return;
|
||||
}
|
||||
if (this.form.aimWl.value == model.orderInInfo.locCode) {
|
||||
this.customToast(this.$t('message.TargetLocation') as string);
|
||||
return;
|
||||
}
|
||||
const orderlist = [
|
||||
{
|
||||
...this.model.orderInInfo,
|
||||
originWl: this.model.orderInInfo.locCode,
|
||||
barCode: this.model.orderInInfo.barcode,
|
||||
aimWl: this.form.aimWl.value,
|
||||
type: '2',
|
||||
orderType: '5',
|
||||
keepBy: session.loginName as string,
|
||||
factoryCode: session.factoryCode as string,
|
||||
userDefined4: this.userDefined4,
|
||||
},
|
||||
];
|
||||
await this.model.onTakeoutConfirm(orderlist);
|
||||
if (model.code == '1') {
|
||||
this.customToast(this.$t('message.Warehouse_Tip9') as string);
|
||||
// this.form.productCode = '';
|
||||
this.model.empty();
|
||||
// this.query()
|
||||
this.form.productCode = '';
|
||||
this.allNum = 0;
|
||||
this.QueryHistory();
|
||||
// setTimeout(() => {
|
||||
// this.$forceUpdate();
|
||||
// }, 2000);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
</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;
|
||||
.Transfer {
|
||||
width: 280rpx;
|
||||
height: 64rpx;
|
||||
background: rgb(242, 242, 242);
|
||||
border-radius: 110rpx;
|
||||
}
|
||||
}
|
||||
.single {
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
display: flex;
|
||||
.single-left {
|
||||
width: 80%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
view {
|
||||
width: 170rpx;
|
||||
height: 100%;
|
||||
line-height: 100rpx;
|
||||
}
|
||||
}
|
||||
.single-right {
|
||||
button {
|
||||
margin-top: 15rpx;
|
||||
width: 140rpx;
|
||||
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>
|
||||
@ -0,0 +1,150 @@
|
||||
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 vm from '@/main';
|
||||
// import { page } from '@/utils/page';
|
||||
|
||||
class OrderInInfo {
|
||||
productDescZh?: string;
|
||||
qty?: string;
|
||||
custCode?: string;
|
||||
custCodeName?: string;
|
||||
productCode?: string;
|
||||
locCode?: string;
|
||||
barcode?: string;
|
||||
// actualQty?: string;
|
||||
}
|
||||
|
||||
@Module({
|
||||
namespaced: true,
|
||||
dynamic: true,
|
||||
store,
|
||||
name: 'product.Semi-finished-rowTransfer',
|
||||
})
|
||||
export class wholeTransfer extends VuexModule {
|
||||
/**
|
||||
* 库位地点列表
|
||||
*/
|
||||
WlList = [];
|
||||
userDefined: any = '';
|
||||
detailedList: any;
|
||||
code = '';
|
||||
delCode = '';
|
||||
removeList: any = [];
|
||||
removeMaterialList: any = [];
|
||||
dnNo = '';
|
||||
orderInInfo: OrderInInfo = new OrderInInfo();
|
||||
@MutationAction
|
||||
async queryLocation() {
|
||||
const result: any = await http.get(url.warehouse.wholeTransfer.getMdLocationSfgLine, {
|
||||
params: {
|
||||
factoryCode: session.factoryCode,
|
||||
loginName: session.loginName,
|
||||
},
|
||||
});
|
||||
console.log('库位数据', result);
|
||||
const WlList = result.data.map((_: any) => ({
|
||||
label: _.locationCode,
|
||||
value: _.locationCode,
|
||||
}));
|
||||
return { WlList };
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询单号
|
||||
* 查询DN单号
|
||||
* @param dnNo
|
||||
*/
|
||||
@MutationAction
|
||||
async getProductCode(barcode: any) {
|
||||
const res: any = await http.post(url.warehouse.wholeTransfer.getOdsRawStorageSnNew, {
|
||||
factoryCode: session.factoryCode,
|
||||
loginName: session.loginName,
|
||||
barcode,
|
||||
});
|
||||
const code = res.code;
|
||||
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;
|
||||
}
|
||||
return { orderInInfo, code };
|
||||
}
|
||||
//退扫
|
||||
@MutationAction
|
||||
async codeDel(params: any) {
|
||||
const res: any = await http.post(url.warehouse.wholeTransfer.del, params);
|
||||
const delCode = res.code;
|
||||
return { delCode };
|
||||
}
|
||||
//清除数据
|
||||
@MutationAction
|
||||
async empty() {
|
||||
const orderInInfo: any = [];
|
||||
// const userDefined = '';
|
||||
// const WlList = [];
|
||||
const code = '';
|
||||
return { orderInInfo, code };
|
||||
}
|
||||
@MutationAction
|
||||
async onTakeoutConfirm(list: any) {
|
||||
const records: any = await http.post(url.warehouse.rowTransfer.confirmMoveRussia, list);
|
||||
const code = records.code;
|
||||
return { code };
|
||||
}
|
||||
//生成移库码
|
||||
@MutationAction
|
||||
async getCpMoveBatchNo(loginName: any) {
|
||||
const res: any = await http.post(url.warehouse.rowTransfer.getSfgMoveBatchNo, loginName);
|
||||
const userDefined: any = res.data;
|
||||
return { userDefined };
|
||||
}
|
||||
//查询已扫物料
|
||||
@MutationAction
|
||||
async QueryHistory(params: any = {}) {
|
||||
const res: any = await http.post(url.warehouse.rowTransfer.queryGroupListByMoveCode, params);
|
||||
const removeList: any = res.data;
|
||||
const removeMaterialList: any = [];
|
||||
res.data.forEach((item: any) => {
|
||||
const arr: any = {
|
||||
value: item.materialCode,
|
||||
laber: item.materialCode,
|
||||
};
|
||||
removeMaterialList.push(arr);
|
||||
});
|
||||
return { removeList, removeMaterialList };
|
||||
}
|
||||
//查询明细
|
||||
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
|
||||
async querydetaildlist(userDefined4: any) {
|
||||
const res: any = await http.post('/wmspda/fg/queryListByMoveCode', {
|
||||
loginName: session.loginName,
|
||||
factoryCode: session.factoryCode,
|
||||
proMoveCode: userDefined4,
|
||||
});
|
||||
console.log('明细》》》》》》》》》', res.list);
|
||||
this.detailedList = res.data;
|
||||
return res;
|
||||
}
|
||||
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
|
||||
async changeOrderInLocation(kw: string) {
|
||||
await http.post('/wmspda/material/orderin/enter', {
|
||||
loginName: session.loginName,
|
||||
// loginName: '1999',
|
||||
warehouseCode: '',
|
||||
factoryCode: session.factoryCode,
|
||||
// factoryCode: '1999',
|
||||
locationCode: kw,
|
||||
});
|
||||
return kw;
|
||||
}
|
||||
}
|
||||
|
||||
export default getModule(wholeTransfer);
|
||||
@ -0,0 +1,84 @@
|
||||
/**
|
||||
* 看单交接明细表格列
|
||||
*/
|
||||
import vm from '@/main';
|
||||
export const headers = [
|
||||
{
|
||||
label: vm.$t('message.Warehouse_OrderNo'),
|
||||
key: 'orderNo', //单号
|
||||
// width: '15%',
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.po_MaterielNo'),
|
||||
key: 'productCode', //物料号
|
||||
// width: '15%',
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.po_MaterielDes'),
|
||||
key: 'productDescZh', //物料描述
|
||||
width: 350,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.dn_Number'),
|
||||
key: 'qty', //数量
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.Warehouse_OriginalLocation'),
|
||||
key: 'originWl', //原库位
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.Warehouse_TargetLocation'),
|
||||
key: 'aimWl', //目标库位
|
||||
},
|
||||
];
|
||||
export const RUSdetailHeader = [
|
||||
{
|
||||
label: vm.$t('message.Warehouse_OrderNo'),
|
||||
key: 'orderNo', //单号
|
||||
width: 270,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.po_MaterielNo'),
|
||||
key: 'productCode', //物料号
|
||||
width: 270,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.po_MaterielDes'),
|
||||
key: 'productDescZh', //物料描述
|
||||
width: 520,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.Container'),
|
||||
key: 'barCode', //物料描述
|
||||
width: 400,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.dn_Number'),
|
||||
key: 'qty', //数量
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.Warehouse_OriginalLocation'),
|
||||
key: 'originWl', //原库位
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.Warehouse_TargetLocation'),
|
||||
key: 'aimWl', //目标库位
|
||||
},
|
||||
];
|
||||
export const TargetTitle = [
|
||||
{
|
||||
label: vm.$t('message.ContainerBarcode'),
|
||||
key: 'barcode', //容器条码
|
||||
width: 270,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.dn_Number'),
|
||||
key: 'qty', //数量
|
||||
// width: 270,
|
||||
},
|
||||
{
|
||||
label: vm.$t('message.CommissionedLocation'),
|
||||
key: 'locCode', //库位
|
||||
width: 250,
|
||||
},
|
||||
];
|
||||
@ -0,0 +1,231 @@
|
||||
<template>
|
||||
<view class="page-kan-dan-index">
|
||||
<view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
|
||||
<view class="left">
|
||||
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
|
||||
</view>
|
||||
<view class="title">{{ $t('message.ContainerScrap') }}</view>
|
||||
<view class="right"></view>
|
||||
</view>
|
||||
<u-form class="form" ref="form" :error-type="['toast']" label-width="150rpx">
|
||||
<!-- 容器码 -->
|
||||
<u-form-item :required="true" :label="$t('message.Container')" prop="orderNo">
|
||||
<u-search :placeholder="$t('message.TargetContainer')" v-model.trim="barcode" @search="query" :show-action="false"></u-search>
|
||||
</u-form-item>
|
||||
<!-- 物料编码 -->
|
||||
<u-form-item :label="$t('message.matcode')">
|
||||
<u-input :disabled="true" v-model="every.productCode" placeholder="" style="overflow: hidden" />
|
||||
</u-form-item>
|
||||
<!-- 物料描述 -->
|
||||
<u-form-item :label="$t('message.po_MaterielDes')">
|
||||
<u-input :disabled="true" v-model="every.productDescZh" placeholder="" style="overflow: hidden" />
|
||||
</u-form-item>
|
||||
<!-- 数量 -->
|
||||
<u-form-item :label="$t('message.dn_Number')">
|
||||
<u-input :disabled="true" v-model="every.qty" placeholder="" />
|
||||
</u-form-item>
|
||||
<!-- 库位 -->
|
||||
<u-form-item :label="$t('message.CommissionedLocation')">
|
||||
<u-input :disabled="true" v-model="every.locCode" placeholder="" />
|
||||
</u-form-item>
|
||||
<!-- 报废原因 -->
|
||||
<u-form-item :label="$t('message.reason')">
|
||||
<u-input v-model="reason" :border="border" :placeholder="$t('message.scrapReason')" />
|
||||
</u-form-item>
|
||||
</u-form>
|
||||
<view class="bottom-bar">
|
||||
<u-row class="button-bar">
|
||||
<!-- 确定 -->
|
||||
<u-col :span="6">
|
||||
<u-button type="primary" @click="submit">{{ $t('message.product_Confirm') }}</u-button>
|
||||
</u-col>
|
||||
<!-- 返回 -->
|
||||
<u-col :span="6">
|
||||
<u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
|
||||
</u-col>
|
||||
</u-row>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import { TargetTitle } from './config';
|
||||
import { Component } from 'vue-property-decorator';
|
||||
import { BasePage } from '@/components/base/page';
|
||||
import model from './model';
|
||||
import jPicker from '@/components/J-Picker/jPicker.vue';
|
||||
@Component({
|
||||
components: {
|
||||
jPicker,
|
||||
},
|
||||
})
|
||||
export default class KanDanHandOver extends BasePage {
|
||||
TargetTitle = TargetTitle;
|
||||
border = true;
|
||||
model = model;
|
||||
barcode = '';
|
||||
every: any = {};
|
||||
async query() {
|
||||
if (this.barcode == '' || this.barcode.length == 0) {
|
||||
this.customToast(this.$t('message.Commission_tips1') as string);
|
||||
return;
|
||||
}
|
||||
await this.model.searchBarcode(this.barcode);
|
||||
if (this.model.SearchCode == '1') {
|
||||
uni.showToast({
|
||||
title: this.$t('message.successful') as string,
|
||||
duration: 2000,
|
||||
image: '/static/icons/icon-51.png',
|
||||
});
|
||||
this.every = this.model.CodeDetail;
|
||||
}
|
||||
}
|
||||
reason = '';
|
||||
async submit() {
|
||||
if (this.barcode == '' || this.barcode.length == 0) {
|
||||
this.customToast(this.$t('message.scanningContainer') as string);
|
||||
return;
|
||||
}
|
||||
if (this.every == {} || !this.every.barcode) {
|
||||
this.customToast(this.$t('message.scanningContainer') as string);
|
||||
return;
|
||||
}
|
||||
if (this.every.qty != 0) {
|
||||
this.customToast(this.$t('message.scrapped') as string);
|
||||
return;
|
||||
}
|
||||
let params = {
|
||||
barcode: this.every.barcode,
|
||||
productCode: this.every.productCode,
|
||||
productDescZh: this.every.productDescZh,
|
||||
locCode: this.every.locCode,
|
||||
qty: this.every.qty,
|
||||
cpRef4: this.every.cpRef4,
|
||||
};
|
||||
await this.model.submit(params);
|
||||
if (this.model.submitCode == '1') {
|
||||
this.customToast(this.$t('message.success') as string);
|
||||
this.barcode = '';
|
||||
this.every = {};
|
||||
this.reason = '';
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.page-kan-dan-index {
|
||||
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: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
z-index: 99;
|
||||
display: flex;
|
||||
height: 67px;
|
||||
line-height: 88rpx;
|
||||
color: #fff;
|
||||
font-size: 34rpx;
|
||||
font-weight: 500;
|
||||
text-align: center;
|
||||
padding-top: 19px;
|
||||
.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;
|
||||
z-index: 10000;
|
||||
}
|
||||
}
|
||||
.single-right {
|
||||
button {
|
||||
margin-top: 15rpx;
|
||||
width: 150rpx;
|
||||
height: 70rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
.add {
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
position: absolute;
|
||||
top: 442px;
|
||||
left: 0;
|
||||
button {
|
||||
position: absolute;
|
||||
top: 3rpx;
|
||||
right: 35rpx;
|
||||
z-index: 10000;
|
||||
}
|
||||
}
|
||||
.NumAdd {
|
||||
width: 100%;
|
||||
height: 100rpx;
|
||||
position: relative;
|
||||
// top: 496px;
|
||||
// left: 0;
|
||||
button {
|
||||
position: absolute;
|
||||
top: 3rpx;
|
||||
right: 35rpx;
|
||||
z-index: 10000;
|
||||
}
|
||||
}
|
||||
.newly {
|
||||
display: flex;
|
||||
}
|
||||
}
|
||||
.single-right {
|
||||
button {
|
||||
//margin-top: 15rpx;
|
||||
width: 110rpx;
|
||||
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;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@ -0,0 +1,40 @@
|
||||
import { 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';
|
||||
@Module({
|
||||
namespaced: true,
|
||||
dynamic: true,
|
||||
store,
|
||||
name: 'raw.warehouse.Container-scrap',
|
||||
})
|
||||
export class rowTransfer extends VuexModule {
|
||||
//目标容器查询
|
||||
SearchCode: any = '';
|
||||
CodeDetail: any = '';
|
||||
@MutationAction
|
||||
async searchBarcode(barcode: any) {
|
||||
const res: any = await http.post(url.warehouse.container.getRawStorageSnNew, {
|
||||
barcode,
|
||||
factoryCode: session.factoryCode,
|
||||
loginName: session.loginName,
|
||||
});
|
||||
const SearchCode = res.code;
|
||||
const CodeDetail = res.data;
|
||||
if (CodeDetail.cpRef4 != null) {
|
||||
CodeDetail.qty = parseFloat(CodeDetail.qty) - parseFloat(CodeDetail.cpRef4);
|
||||
}
|
||||
return { SearchCode, CodeDetail };
|
||||
}
|
||||
//提交数据
|
||||
submitCode: any = '';
|
||||
@MutationAction
|
||||
async submit(params: any) {
|
||||
const res: any = await http.post(url.warehouse.container.russia, params);
|
||||
const submitCode = res.code;
|
||||
return { submitCode };
|
||||
}
|
||||
}
|
||||
|
||||
export default getModule(rowTransfer);
|
||||
Loading…
Reference in New Issue