cosmoim-852 fix 新增 泰国备件出库功能

master
hou 3 years ago
parent 3dbd103bff
commit fee0471ae5

@ -479,5 +479,8 @@ export default {
plan: '计划数量',
QuantityShelves: '已上架数量',
TheShelves: '已下架数量',
Box: '箱码',
enterBox: '请输入箱码',
ScanBoxCode: '请先扫描箱码',
},
};

@ -479,5 +479,8 @@ export default {
plan: 'Plan QTY',
QuantityShelves: 'Putaway QTY',
TheShelves: 'Shelves QTY',
Box: 'Box Code',
enterBox: 'Please enter the box code',
ScanBoxCode: 'Please scan the box code first',
},
};

@ -479,5 +479,8 @@ export default {
plan: 'план',
QuantityShelves: 'На крыше',
TheShelves: 'С полок',
Box: 'Ящик ярд',
enterBox: 'Введите код ящика',
ScanBoxCode: 'Сначала просканируйте ящики',
},
};

@ -1090,6 +1090,14 @@
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/raw/ingoods/SpareInbound/SparePartsWarehouse/details",
"style": {
"navigationBarTitleText": "备件出库明细",
"navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/raw/handover/feeding/RUS-Location",
"style": {

@ -48,7 +48,7 @@
</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="barcode" @search="onSubmit" :show-action="false"></u-search>
<u-search :placeholder="$t('message.barcode')" v-model.trim="barcode" @search="onSubmit" :show-action="false"></u-search>
</u-form-item>
</u-form>
<view class="bottom-bar">
@ -136,6 +136,7 @@ export default class productCheckReceipt extends BasePage {
this.barcode = '';
this.histroyItem = {};
this.productCodeList = {};
this.model.empty();
await this.query();
}
}

@ -46,6 +46,11 @@ export class wholeTransfer extends VuexModule {
const SubmitCode = result.code;
return { SubmitCode };
}
@MutationAction
async empty() {
const productCodeList = [];
return { productCodeList };
}
}
export default getModule(wholeTransfer);

@ -4,36 +4,41 @@
import vm from '@/main';
export const headers = [
{
label: vm.$t('message.Delivery'),
key: 'proMoveCode', //单号
label: vm.$t('message.dn_OddNumbers'),
key: 'order1',
width: 250,
},
{
label: vm.$t('message.ModelCode'),
key: 'materialCode', //型号编码
label: vm.$t('message.Line'),
key: 'order2',
width: 220,
},
{
label: vm.$t('message.ModelName'),
key: 'materialDesc', //型号名称
label: vm.$t('message.matcode'),
key: 'productCode',
width: 430,
},
{
label: vm.$t('message.po_MaterielDes'),
key: 'productDescZh',
width: 640,
},
{
label: vm.$t('message.product_barCode'),
key: 'barCode', //条码号
width: 260,
key: 'barcode',
width: 640,
},
{
label: vm.$t('message.SourceLocation'),
key: 'wlFromCode', //源库位
label: vm.$t('message.product_Location'),
key: 'locCode',
},
{
label: vm.$t('message.Warehouse_TargetLocation'),
key: 'wlToCode', //目标库位
label: vm.$t('message.Operation'),
key: 'createdBy',
},
{
label: vm.$t('message.operatingTime'),
key: 'moveTime', //操作时间
width: 465,
key: 'createdDate',
width: 475,
},
];

@ -4,10 +4,10 @@
<view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
</view>
<view class="title">{{ $t('message.Warehouse_TransferDetails') }}</view>
<view class="title">{{ $t('message.detailed') }}</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" />
<wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="headers" :contents="model.DetailList" :show-vert-border="false" />
</view>
</template>
<script lang="ts">
@ -17,7 +17,6 @@ import model from './model';
import { headers } from './config';
@Component
export default class KanDanHandOverDetails extends BasePage {
order = '';
headers = headers;
model = model;
}

@ -4,61 +4,57 @@
<view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
</view>
<view class="title">{{ $t('message.SemiProductGetOutOfTheWarehouse') }}</view>
<view class="title">{{ $t('message.SparePartsOutbound') }}</view>
<view class="right"></view>
</view>
<u-form class="form" ref="form" :model="form" label-width="180rpx">
<!-- 移库码 -->
<u-form class="form" ref="form" label-width="180rpx">
<!-- DN单号 -->
<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>{{ $t('message.InventoryOrderNo') }}:</view>
<u-search :placeholder="$t('message.InventoryPleaseScan')" v-model="nxOutCode" @search="query" :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>
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
</view>
</view>
<!-- 总数 -->
<u-form-item :label="$t('message.Warehouse_TotalNumber')">
<u-input :disabled="true" v-model="allNum" placeholder="" />
<!-- 物料编码 -->
<u-form-item :label="$t('message.matcode')">
<jPicker sureColor="#ff0000" @bindpicker="selectProductCode" showKey="value" valKey="value" :val="productCodeList.value" :options="model.productCodeList" />
</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-form-item :label="$t('message.po_MaterielDes')">
<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 :label="$t('message.Line')">
<u-input :disabled="true" v-model="histroyItem.rowItem" placeholder="" style="overflow: hidden" />
</u-form-item>
<!-- 计划数量 -->
<u-form-item :label="$t('message.plan')">
<u-input :disabled="true" v-model="histroyItem.orderAmount" placeholder="" />
</u-form-item>
<!-- 累计数量 -->
<u-form-item :label="$t('message.Cumulative')">
<u-input :disabled="true" v-model="histroyItem.outAmount" placeholder="" />
</u-form-item>
<!-- 箱码 -->
<u-form-item :required="true" :label="$t('message.Box')" prop="productCode">
<u-search :placeholder="$t('message.barcode')" v-model.trim="BoxCode" @search="SeachBoxCode" :show-action="false"></u-search>
</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-search :placeholder="$t('message.barcode')" v-model.trim="barcode" @search="onSubmit" :show-action="false"></u-search>
</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 :span="6">
<u-button type="primary" @click="ToDetail">{{ $t('message.detailed') }}</u-button>
</u-col>
<!-- 返回 -->
<u-col :span="4">
<u-col :span="6">
<u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
</u-col>
</u-row>
@ -66,176 +62,97 @@
</view>
</template>
<script lang="ts">
import { Component, Ref } from 'vue-property-decorator';
import { Component } 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;
nxOutCode: any = '';
productCodeList: any = {};
async query() {
if (this.nxOutCode == '' || this.nxOutCode.length == 0) {
this.customToast(this.$t('message.Commission_tips1') as string);
return;
}
await this.model.queryOrderNo(this.nxOutCode);
this.productCodeList = this.model.productCodeList[0];
this.histroyItem = this.model.orderNoItemList[0];
}
selectItem(e: any) {
this.remove = e.pickerName;
this.model.removeList.forEach((item: any) => {
if (item.materialCode == this.remove.value) {
histroyItem: any = {};
selectProductCode(e: any) {
this.model.orderNoItemList.forEach((item: any) => {
if (item.materialCode == e.pickerName.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);
BoxCode: any = '';
BoxObj: any = {};
async SeachBoxCode() {
if (this.BoxCode == '' || this.BoxCode.length == 0) {
this.customToast(this.$t('message.enterBox') 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',
});
await this.model.BoxCode(this.BoxCode);
if (this.model.BoxResCode == '1') {
this.BoxObj = this.model.BoxObj;
}
}
//
async QueryHistory() {
if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
barcode: any = '';
async onSubmit() {
if (this.nxOutCode == '' || this.nxOutCode.length == 0) {
this.customToast(this.$t('message.Commission_tips1') as string);
return;
}
if (this.histroyItem == {} || !this.histroyItem.materialCode) {
this.customToast(this.$t('message.AppendMateriel5') as string);
return;
}
if (this.barcode == '' || this.barcode.length == 0) {
this.customToast(this.$t('message.barcode') as string);
return;
}
this.allNum = 0;
if (this.BoxCode == '' || !this.BoxObj.barcode) {
this.customToast(this.$t('message.ScanBoxCode') as string);
return;
}
let params = {
loginName: session.loginName,
factoryCode: session.factoryCode,
proMoveCode: this.userDefined4,
nxOutCode: this.nxOutCode,
rowItem: this.histroyItem.rowItem,
materialCode: this.histroyItem.materialCode,
materialDesc: this.histroyItem.materialDesc,
boxCode: this.BoxCode,
barcode: this.barcode,
};
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;
}
});
await this.model.OnSubmit(params);
if (this.model.SubmitCode == '1') {
this.customToast(this.$t('message.Warehouse_Tip9') as string);
this.barcode = '';
this.histroyItem = {};
this.productCodeList = {};
this.model.empty();
// this.BoxCode = '';
// this.BoxObj = {};
await this.query();
}
}
//
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);
async ToDetail() {
if (this.nxOutCode == '' || this.nxOutCode.length == 0) {
this.customToast(this.$t('message.Commission_tips1') 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);
}
});
this.model.DetailList.length = 0;
await this.model.SearchDetail(this.nxOutCode);
this.toPage(this.page.raw.ingoods.SparePartsWarehouse.details);
}
}
</script>

@ -1,149 +1,79 @@
import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
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';
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',
name: 'page.raw.ingoods.SpareInbound.SparePartsWarehouse',
})
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,
},
const result: any = await http.post(url.warehouse.wholeTransfer.getSpareMdLocation, {
factoryCode: session.factoryCode,
loginName: session.loginName,
});
console.log('库位数据', result);
const WlList = result.data.map((_: any) => ({
label: _.locationCode,
value: _.locationCode,
}));
return { WlList };
}
/**
*
* DN
* @param dnNo
*/
orderNoItemList: any = [];
productCodeList: any = [];
@MutationAction
async getProductCode(barcode: any) {
const res: any = await http.post(url.warehouse.wholeTransfer.getOdsRawStorageSnNew, {
async queryOrderNo(nxOutCode: any) {
const result: any = await http.post(url.warehouse.wholeTransfer.findSpareInfoByDN, {
factoryCode: session.factoryCode,
loginName: session.loginName,
nxOutCode,
});
const orderNoItemList = result.data;
const productCodeList = result.data.map((_: any) => ({
label: _.materialCode,
value: _.materialCode,
}));
return { orderNoItemList, productCodeList };
}
BoxResCode: any = '';
BoxObj: any = {};
@MutationAction
async BoxCode(barcode: any) {
const result: any = await http.post(url.warehouse.wholeTransfer.scanBox, {
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 };
const BoxResCode = result.code;
const BoxObj = result.data;
return { BoxResCode, BoxObj };
}
//退扫
SubmitCode: any = '';
@MutationAction
async codeDel(params: any) {
const res: any = await http.post(url.warehouse.wholeTransfer.del, params);
const delCode = res.code;
return { delCode };
async OnSubmit(params: any) {
const result: any = await http.post(url.warehouse.wholeTransfer.saleScan, params);
const SubmitCode = result.code;
return { SubmitCode };
}
//清除数据
@MutationAction
async empty() {
const orderInInfo: any = [];
// const userDefined = '';
// const WlList = [];
const code = '';
return { orderInInfo, code };
const productCodeList = [];
return { productCodeList };
}
DetailList: any = [];
@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,
async SearchDetail(order1: any) {
const res: any = await http.post(url.warehouse.wholeTransfer.querySpareListInfoByDnNo, {
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,
order1,
});
return kw;
const DetailList = res.data;
return { DetailList };
}
}

@ -48,7 +48,7 @@
</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="barcode" @search="onSubmit" :show-action="false"></u-search>
<u-search :placeholder="$t('message.barcode')" v-model.trim="barcode" @search="onSubmit" :show-action="false"></u-search>
</u-form-item>
</u-form>
<view class="bottom-bar">
@ -136,6 +136,7 @@ export default class productCheckReceipt extends BasePage {
this.barcode = '';
this.histroyItem = {};
this.productCodeList = {};
this.model.empty();
await this.query();
}
}

@ -46,6 +46,11 @@ export class wholeTransfer extends VuexModule {
const SubmitCode = result.code;
return { SubmitCode };
}
@MutationAction
async empty() {
const productCodeList = [];
return { productCodeList };
}
}
export default getModule(wholeTransfer);

@ -162,6 +162,9 @@ export const page = {
SpareInboun: {
details: '/pages/raw/ingoods/SpareInbound/Inbound/Local-details',
},
SparePartsWarehouse: {
details: '/pages/raw/ingoods/SpareInbound/SparePartsWarehouse/details',
},
},
warehouse: {
index: '/pages/raw/warehouse/index',

@ -268,8 +268,12 @@ export const url = {
getSpareMdLocation: '/wmspda/sparePart/getSpareMdLocation',
queryOnshelfOrder: '/wmspda/sparePart/queryOnshelfOrder',
queryDownshelfOrder: '/wmspda/sparePart/queryDownshelfOrder',
findSpareInfoByDN: '/wmspda/fg/findSpareInfoByDN',
upshelf: '/wmspda/sparePart/upshelf-scan',
offshelf: '/wmspda/sparePart/offshelf-scan',
scanBox: '/wmspda/sparePart/scanBox',
saleScan: '/wmspda/fg/sparepart/sale/scan',
querySpareListInfoByDnNo: '/wmspda/fg/querySpareListInfoByDnNo',
},
wholeLnventory: {
content: '/wmspda/fg/findMaterialByPddNo',

Loading…
Cancel
Save