cosmoim-852 fix 新增成品sto出库&&原材料sto出库逻辑修改

master
guoshuang 3 years ago
parent 6692146fbf
commit 62a1402b5a

@ -498,5 +498,6 @@ export default {
Nomatch: '没有与该条码匹配的物料',
Sofspinlew: '线边库半成品报废',
LineSide: '线边库',
DNLine_PleaseSelect: '请选择DN行项目',
},
};

@ -498,5 +498,6 @@ export default {
Nomatch: 'There is no material matching this barcode',
Sofspinlew: 'Semi-manufactures Scrap',
LineSide: 'Line side warehouse',
DNLine_PleaseSelect: 'Please select DN line item',
},
};

@ -261,7 +261,7 @@ export default {
InventoryNumber: 'Инвентарный номер',
InventoryFinish: 'Заканчивать',
closure: 'Закрывать',
CommissionEntrant: 'Оприходование комплектующих после доработки поставщиком',
CommissionEntrant: 'Возврат аутсорсинг (SP)',
CommissionedSingleNumber: 'Заказ',
CommissionedMaterielNo: 'код МАТ',
CommissionedMaterielDesc: 'описание МАТ',
@ -273,7 +273,7 @@ export default {
CommissionedEntrantDetails: 'Складирование',
CommissionedReceiptQuantity: 'Количество поступления',
subcontract: 'Субподряд',
CommissionGoOut: 'Аутсорсинговый выход из склада',
CommissionGoOut: 'Передача аутсорсинг(SP)',
Outbound: 'Исходящее местоположение',
Warehousing: 'Расположение склада',
PleaseQuantity: 'Пожалуйста, введите это количество',
@ -498,5 +498,6 @@ export default {
Nomatch: 'Нет совпадений с штриховым кодом',
Sofspinlew: 'браковка полуфабрикатов',
LineSide: 'линейный склад',
DNLine_PleaseSelect: 'Выберите пункт в строке DN',
},
};

@ -1210,14 +1210,14 @@
"navigationBarTextStyle": "white" // white-black-
}
},
// {
// "path": "pages/product/STO-Outbound/index",
// "style": {
// "navigationBarTitleText": "成品STO出库",
// "navigationStyle": "custom", //
// "navigationBarTextStyle": "white" // white-black-
// }
// },
{
"path": "pages/product/STO-Outbound/index",
"style": {
"navigationBarTitleText": "成品STO出库",
"navigationStyle": "custom", //
"navigationBarTextStyle": "white" // white-black-
}
},
{
"path": "pages/demo/index",
"style": {

@ -0,0 +1,465 @@
<template>
<view class="page-raw-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.STOoutbound') }}</view>
<view class="right"></view>
</view>
<view class="content">
<!-- DN单号 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.dn_OddNumbers') }}</view>
<u-search :placeholder="$t('message.dn_PleaseScan')" v-model.trim="dnNo" @search="query" :show-action="false"> </u-search>
</view>
<view class="single-right">
<u-button type="primary" @click="query">{{ $t('message.Query') }}</u-button>
</view>
</view>
<!-- DN行项目 -->
<view class="Purchase-title">
<view class="Purchase">
<view>{{ $t('message.DNLine') }}</view>
<jPicker sureColor="#ff0000" style="width: 260rpx" @bindpicker="SelectDnLine" showKey="value" valKey="value" :val="DnlineNo.value" class="search" :options="model.DnLineList" />
</view>
</view>
<!-- STO单号 -->
<view class="material">
<view class="material-right">
<view class="material-right-title">{{ $t('message.STOInventoryOrderNo') }}</view>
<view class="material-right-code" style="overflow: hidden">{{ TheItem.stoNo }}</view>
</view>
</view>
<!-- STO行项目 -->
<view class="material">
<view class="material-right">
<view class="material-right-title">{{ $t('message.STOLine') }}</view>
<view class="material-right-code" style="overflow: hidden">{{ TheItem.stoItem }}</view>
</view>
</view>
<!-- 物料编码 -->
<view class="material">
<view class="material-right">
<view class="material-right-title">{{ $t('message.matcode') }}</view>
<view class="material-right-code" style="overflow: hidden">{{ TheItem.materialCode }}</view>
</view>
</view>
<!-- 物料描述 -->
<view class="material">
<view class="material-right">
<view class="material-right-title">{{ $t('message.po_MaterielDes') }}</view>
<view class="material-right-code" style="overflow: hidden">{{ TheItem.materialDesc }}</view>
</view>
</view>
<!-- 计划数量&&已出数量 -->
<view class="number">
<view class="number-left">
<view class="number-left-title">{{ $t('message.plan') }}</view>
<u-input v-model="TheItem.orderAmount" placeholder=" " :type="item" :border="border" class="input" disabled style="padding: '0'" />
</view>
<view class="number-right">
<view class="number-right-title">{{ $t('message.OutboundNum') }}</view>
<u-input v-model="TheItem.scanAmount" placeholder="" :type="type" :border="border" class="input" disabled style="padding: '0'" />
</view>
</view>
<!-- 出库库位 -->
<view class="material">
<view class="material-right">
<view class="material-right-title">{{ $t('message.DeliveryLoc') }}</view>
<view class="material-right-code" style="overflow: hidden">{{ TheItem.deliveryRegion }}</view>
</view>
</view>
<!-- 扫码 -->
<u-form-item :label="$t('message.product_BarCode')">
<u-search :placeholder="$t('message.po_PleaseInput')" v-model="barCode" @search="onOk" :focus="firstFocus" :show-action="false"></u-search>
</u-form-item>
</view>
<!-- 底部按钮 -->
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="6">
<u-button type="primary" @click="Submit">{{ $t('message.Posting') }}</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 { Component } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import jPicker from '@/components/J-Picker/jPicker.vue';
import { session } from '@/store/modules/session';
import model from './model';
//import { Tabheaders } from './config';
@Component({
components: {
jPicker,
},
})
export default class dnReceiptDom extends BasePage {
border = true;
type = 'text';
item = 'text';
//Tabheaders = Tabheaders;
model = model;
dnNo: any = '';
barCode: any = '';
firstFocus = false;
dnNoList: any = [];
DnlineNo: any = {};
LocList: any = [];
Loc: any = {};
TheItem: any = '';
ItemIndex: any = '';
async query() {
if (!this.dnNo) {
this.customToast(this.$t('message.Warehouse_Tip1') as any);
return;
}
await model.Querydn(this.dnNo);
this.dnNoList = this.model.dnNoList;
this.DnlineNo = this.model.DnLineList[0];
this.TheItem = this.model.dnNoList[0];
this.ItemIndex = 0;
}
// TheItem: any = {};
// ItemIndex: any = 0;
async SelectDnLine(e: any) {
this.DnlineNo = e.pickerName;
this.model.dnNoList.forEach((item: any, index: any) => {
if (item.dnItem == this.DnlineNo.value) {
this.TheItem = item;
this.ItemIndex = index;
}
});
}
//num: any = '';
//SunmitList: any = [];
async onOk() {
if (!this.dnNo) {
this.customToast(this.$t('message.Warehouse_Tip1') as any);
return;
}
// if (!this.DnlineNo) {
// this.customToast(this.$t('message.Warehouse_Tip1') as any);
// return;
// }
if (!this.barCode) {
this.customToast(this.$t('message.barcode_PleaseScan') as any);
return;
}
const selctlist = {
barCode: this.barCode,
loginName: session.loginName,
factoryCode: session.factoryCode,
dnNo: this.dnNo,
dnItem: this.DnlineNo.value,
materialCode: this.TheItem.materialCode,
};
await this.model.stoDnProdScan(selctlist);
if (this.model.res.code == '1') {
this.customToast(this.$t('message.Warehouse_Tip9') as any);
//this.TheItem.scanAmount = this.TheItem.scanAmount + 1;
this.model.dnNoList[this.ItemIndex].scanAmount += 1;
this.barCode = '';
}
}
//
async Submit() {
const SunmitList = {
loginName: session.loginName,
factoryCode: session.factoryCode,
dnNo: this.dnNo,
};
await this.model.SubmitList(SunmitList);
if (this.model.SubCode == 1) {
uni.showToast({
title: this.$t('message.success') as string,
image: '/static/icons/icon-51.png',
});
this.empty();
}
}
empty() {
this.dnNo = '';
// this.LocList = [];
// this.Loc = {};
this.TheItem = {};
this.ItemIndex = 0;
this.dnNoList = [];
this.DnlineNo = {};
this.barCode = '';
//this.SunmitList = [];
this.model.dnNoList.length = 0;
}
}
</script>
<style lang="scss" scoped>
.page-raw-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;
}
}
.content {
width: 100%;
background: white;
border-radius: 15rpx;
padding: 10rpx;
.single {
width: 100%;
height: 100rpx;
display: flex;
.single-left {
width: 79%;
height: 100%;
display: flex;
view {
width: 110rpx;
height: 100%;
line-height: 100rpx;
}
}
.single-right {
button {
margin-top: 15rpx;
width: 150rpx;
height: 70rpx;
}
}
}
.Purchase-title {
width: 100%;
.Purchase {
width: 60%;
height: 100%;
display: flex;
view {
width: 140rpx;
line-height: 100rpx;
}
}
}
// .material {
// width: 100%;
// height: 100rpx;
// display: flex;
// .material-left {
// width: 100%;
// height: 100%;
// display: flex;
// view {
// width: 100rpx;
// line-height: 100rpx;
// }
// }
// }
.material {
width: 100%;
height: 100rpx;
display: flex;
.material-left {
width: 100%;
height: 100%;
display: flex;
view {
width: 140rpx;
line-height: 100rpx;
text-align: left;
}
}
.material-right {
width: 100%;
height: 100%;
display: flex;
.material-right-title {
width: 140rpx;
height: 100%;
line-height: 100rpx;
}
.material-right-code {
width: 80%;
height: 100%;
line-height: 100rpx;
text-align: left;
padding-left: 10px;
}
}
}
.number {
height: 100rpx;
display: flex;
.number-left {
width: 45%;
height: 100%;
display: flex;
.number-left-title {
width: 120rpx;
height: 100%;
line-height: 100rpx;
}
.input {
width: 200rpx;
height: 70rpx;
margin-top: 15rpx;
margin-left: 15rpx;
}
}
.number-right {
width: 55%;
height: 100%;
display: flex;
.number-right-title {
width: 140rpx;
height: 100%;
//text-align: center;
line-height: 100rpx;
}
.input {
width: 200rpx;
height: 70rpx;
margin-top: 15rpx;
margin-left: 15rpx;
}
}
}
// .library {
// width: 100%;
// height: 100rpx;
// display: flex;
// .library-left {
// width: 50%;
// height: 100%;
// display: flex;
// view {
// width: 100rpx;
// line-height: 100rpx;
// }
// .search {
// padding-left: 20px;
// }
// }
// .library-right {
// width: 50%;
// height: 100%;
// display: flex;
// .library-right-title {
// width: 120rpx;
// height: 100%;
// padding-left: 4px;
// line-height: 100rpx;
// }
// .input {
// width: 200rpx;
// height: 70rpx;
// margin-top: 15rpx;
// }
// }
// }
.add {
width: 100%;
height: 100rpx;
position: absolute;
top: 351px;
left: 0;
button {
position: absolute;
top: 3rpx;
right: 35rpx;
}
}
.config {
width: 100%;
height: 100rpx;
position: relative;
display: flex;
// top: 420px;
// left: 0;
button {
position: absolute;
// top: 455px;
right: 1px;
}
.AddQty {
width: 20px;
height: 20px;
}
}
}
.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,82 @@
/*
* @Author: zhou lei
* @Date: 2022-10-10 15:40:04
* @LastEditTime: 2022-10-12 11:35:25
* @LastEditors: zhou lei
* @Description:
* @FilePath: \hgwms-factory-app\src\pages\product\STO-Outbound\model.ts
* :910592680@qq.com 18669792120
*/
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: 'product.STO.STO-Outbound.index',
})
export class ReceiptModule extends VuexModule {
//俄罗斯 STO出库 扫描DN单号
dnNoList: any = [];
DnLineList: any = [];
res: any = '';
@MutationAction
async Querydn(dnNo: any) {
console.log('dnNo', dnNo);
const res: any = await http.post(url.outbound.stoOutbound.dnQuery, {
factoryCode: session.factoryCode,
loginName: session.loginName,
dnNo,
});
const dnNoList = res.data;
const DnLineList = [];
dnNoList.forEach((item: any) => {
const obj = {
value: item.dnItem,
lable: item.dnItem,
};
DnLineList.push(obj);
});
return { dnNoList, DnLineList };
}
//俄罗斯sto成品扫码出库
@MutationAction
async stoDnProdScan(list: any) {
const res: any = await http.post(url.outbound.stoOutbound.stoDnProdScan, list);
//const resCode = res.code;
return { res };
}
//俄罗斯 STO出库 查询库位
LocList: any = [];
@MutationAction
async QueryLoc(sendSpot: any) {
const res: any = await http.post(url.auth.query.queryByFactoryCodeAndWorkAreaCode, {
factoryCode: session.factoryCode,
loginName: session.loginName,
workArea: session.workareaCode,
sendSpot,
});
const LocList = [];
res.forEach((item: any) => {
const obj = {
value: item.locationCode,
lable: item.locationCode,
};
LocList.push(obj);
});
return { LocList };
}
//俄罗斯 出库提交
SubCode: any = '';
@MutationAction
async SubmitList(list: any) {
const res: any = await http.post(url.outbound.stoOutbound.stoDnOutPost, list);
const SubCode = res.code;
return { SubCode };
}
}
export default getModule(ReceiptModule);

@ -1,10 +1,10 @@
/*
* @Author: zhou lei
* @Date: 2022-09-29 13:45:51
* @LastEditTime: 2022-09-29 15:56:26
* @LastEditTime: 2022-10-12 13:40:44
* @LastEditors: zhou lei
* @Description:
* @FilePath: \hgwms-factory-app\src\pages\raw\Semi-finished\LineEdge-scrap\model.ts
* @FilePath: \hgwms-factory-app\src\pages\raw\LineSide\LineEdge-scrap\model.ts
* :910592680@qq.com 18669792120
*/
import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
@ -16,7 +16,7 @@ import { session } from '@/store/modules/session';
namespaced: true,
dynamic: true,
store,
name: 'raw.Semi-finished.LineEdge-scrap',
name: 'raw.LineSide.LineEdge-scrap',
})
export class semifinished extends VuexModule {
//目标容器查询

@ -47,6 +47,11 @@ export const Tabheaders = [
key: 'wlCode',
width: 350,
},
{
label: vm.$t('message.Container'),
key: 'barCode',
width: 350,
},
{
label: vm.$t('message.product_Number'),
key: 'nowAmount',

@ -72,18 +72,23 @@
<view class="material-right-code" style="overflow: hidden">{{ TheItem.deliveryRegion }}</view>
</view>
</view>
<!-- 扫码 -->
<u-form-item :label="$t('message.product_BarCode')">
<u-search :placeholder="$t('message.po_PleaseInput')" v-model="barCode" @search="onOk" :focus="firstFocus" :show-action="false"></u-search>
</u-form-item>
<!-- 库位 -->
<view class="library">
<view class="library-left">
<view>{{ $t('message.CommissionedLocation') }}</view>
<jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="SelectLoc" showKey="value" valKey="value" :val="Loc.value" class="search" :options="LocList" />
<u-input v-model="locCode" disabled placeholder="" style="margin-top: 8px" />
<!-- <jPicker sureColor="#ff0000" style="width: 230rpx" @bindpicker="SelectLoc" showKey="value" valKey="value" :val="Loc.value" class="search" :options="LocList" /> -->
</view>
</view>
<!-- 数量 -->
<view class="single">
<view class="single-left">
<view>{{ $t('message.dn_Number') }}:</view>
<u-input v-model="num" :placeholder="$t('message.Summary_PleaseInputNumber')" style="margin-top: 8px" />
<u-input v-model="num" disabled placeholder="" style="margin-top: 8px" />
</view>
<view class="single-right">
<u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@ -119,6 +124,8 @@ import { Tabheaders } from './config';
})
export default class dnReceiptDom extends BasePage {
border = true;
firstFocus = false;
barCode: any = '';
type = 'text';
Tabheaders = Tabheaders;
model = model;
@ -127,6 +134,7 @@ export default class dnReceiptDom extends BasePage {
DnlineNo: any = {};
LocList: any = [];
Loc: any = {};
locCode: any = '';
async QueryLoc() {
await this.model.QueryLoc(this.TheItem.deliveryRegion);
this.LocList = this.model.LocList;
@ -150,7 +158,7 @@ export default class dnReceiptDom extends BasePage {
this.DnlineNo = this.model.DnLineList[0];
this.TheItem = this.model.dnNoList[0];
this.ItemIndex = 0;
await this.QueryLoc();
//await this.QueryLoc();
} else if (res.cancel) {
return;
}
@ -162,7 +170,7 @@ export default class dnReceiptDom extends BasePage {
this.DnlineNo = this.model.DnLineList[0];
this.TheItem = this.model.dnNoList[0];
this.ItemIndex = 0;
await this.QueryLoc();
//await this.QueryLoc();
}
}
TheItem: any = {};
@ -175,12 +183,42 @@ export default class dnReceiptDom extends BasePage {
this.ItemIndex = index;
}
});
await this.QueryLoc();
//await this.QueryLoc();
}
item: any = '';
SelectLoc(e: any) {
this.Loc = e.pickerName;
}
//
async onOk() {
if (!this.dnNo) {
this.customToast(this.$t('message.Warehouse_Tip1') as any);
return;
}
if (!this.barCode) {
this.customToast(this.$t('message.barcode_PleaseScan') as any);
return;
}
if (!this.TheItem.materialCode) {
this.customToast(this.$t('message.DNLine_PleaseSelect') as any);
return;
}
const selctlist = {
barcode: this.barCode,
productCode: this.TheItem.materialCode,
loginName: session.loginName,
factoryCode: session.factoryCode,
};
await this.model.stoDnProdScan(selctlist);
if (this.model.res.code == '1') {
this.customToast(this.$t('message.Warehouse_Tip9') as any);
const data = this.model.res.data;
this.locCode = data.locCode;
this.num = parseFloat(data.qty) - (data.cpRef4 ? parseFloat(data.cpRef4) : 0);
//this.TheItem.scanAmount = this.TheItem.scanAmount + 1;
//this.barCode = '';
}
}
num: any = '';
SunmitList: any = [];
Add() {
@ -192,7 +230,11 @@ export default class dnReceiptDom extends BasePage {
this.customToast(this.$t('message.Warehouse_Tip6') as any);
return;
}
if (!this.Loc) {
if (!this.barCode) {
this.customToast(this.$t('message.barcode_PleaseScan') as any);
return;
}
if (!this.locCode) {
this.customToast(this.$t('message.Warehouse_Tip2') as any);
return;
}
@ -223,11 +265,14 @@ export default class dnReceiptDom extends BasePage {
materialCode: this.TheItem.materialCode,
orderAmount: this.TheItem.orderAmount,
scanAmount: this.TheItem.orderAmount,
wlCode: this.Loc.value,
wlCode: this.locCode,
nowAmount: this.num,
barCode: this.barCode,
};
this.SunmitList.push(obj);
this.barCode = '';
this.num = '';
this.locCode = '';
console.log('this.model.dnNoList', this.model.dnNoList);
}
deleteItem(e: any) {
@ -272,7 +317,9 @@ export default class dnReceiptDom extends BasePage {
empty() {
this.dnNo = '';
this.LocList = [];
this.Loc = {};
this.locCode = '';
this.num = '';
this.barCode = '';
this.TheItem = {};
this.ItemIndex = 0;
this.dnNoList = [];

@ -1,3 +1,12 @@
/*
* @Author: zhou lei
* @Date: 2022-09-28 10:26:36
* @LastEditTime: 2022-10-12 11:56:22
* @LastEditors: zhou lei
* @Description:
* @FilePath: \hgwms-factory-app\src\pages\raw\STO\STO-Outbound\model.ts
* :910592680@qq.com 18669792120
*/
import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
import store from '@/store';
import http from '@/utils/request';
@ -52,6 +61,14 @@ export class ReceiptModule extends VuexModule {
});
return { LocList };
}
//扫描条码
res: any = '';
@MutationAction
async stoDnProdScan(list: any) {
const res: any = await http.post(url.auth.query.barcode, list);
//const SubCode = res.code;
return { res };
}
//俄罗斯 出库提交
SubCode: any = '';
@MutationAction

@ -137,6 +137,9 @@ export const url = {
//出库
outbound: {
stoOutbound: {
dnQuery: '/wmspda/fg/findStoDnInfo/fg/russia',
stoDnProdScan: '/wmspda/fg/stoDnProdScan/russia',
stoDnOutPost: '/wmspda/fg/stoDnOut/post/russia',
info: '/wmspda/material/orderout/queryStoPlan',
findProdInfoByDN: '/wmspda/fg/findProdInfoByDN',
yuetaiType: '/wmspda/fg/queryDocksUnderWareHouse',

Loading…
Cancel
Save