特殊出库&生产领料调整

master
guoshuang 8 months ago
parent 659af4865d
commit 4939eb98f2

@ -639,11 +639,18 @@
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
}
},
{
"path": "pages/wms/Raw/SpecialDelivery/index",
"style": {
"navigationBarTitleText": "特殊出库",
"navigationStyle": "custom",
"navigationBarTextStyle": "white"
}
}
],
"globalStyle": {
"navigationBarTextStyle": "black",

@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
// console.log('Version////', this.Version);
}
///******************
version = '0.0.132'; //
version = '0.0.133'; //
//version = '0.0.14'; //
//*************** false true ****************
//isTest = true;

@ -82,7 +82,7 @@
</view>
<view class="row-list">
<view class="list-item"> 数量: </view>
<u-input border placeholder="" @blur="confirmNumber(item)" v-model="item.amount" />
<u-input border placeholder="" @blur="confirmNumber(item, index)" v-model="item.amount" />
</view>
<view a:if="true" class="righttitle">
<view @click.stop="delet(item, index)" class="boder-icon-rigth"> 删除 </view>
@ -230,6 +230,7 @@ export default class ProductionREQ extends BasePage {
if (model.getidcardcode == '200') {
let alreadyList = model.byidcardobj;
alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
alreadyList.actuamount = alreadyList.amount;
let tianjiaflage = this.materilist.some((item) => item.materialCode == alreadyList.materialCode);
if (tianjiaflage) {
this.materilist.forEach((item) => {
@ -282,7 +283,14 @@ export default class ProductionREQ extends BasePage {
});
}
}
confirmNumber(changeobj) {
confirmNumber(changeobj, index) {
if (changeobj.amount > changeobj.actuamount) {
(this.$refs.uToast as any).show({
title: '该标志卡的输入数量不能大于标志卡的实际数量',
type: 'waring',
});
this.list[index].amount = this.list[index].actuamount;
}
let addnumber = 0;
this.list.forEach((item) => {
if (item.materialCode == changeobj.materialCode) {

@ -0,0 +1,737 @@
<template>
<view class="page-product-receipt">
<view class="header" :style="{ backgroundColor: `rgba(250, 53, 52, ${scrollTop / 100})` }">
<view class="left">
<u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
</view>
<view class="title">特殊出库</view>
<view class="right"></view>
</view>
<view class="fiexdcontent">
<u-form class="form" ref="form" label-width="180rpx">
<!-- 单号 -->
<!-- <view class="single">
<view class="single-left">
<view>领料单:</view>
<u-search placeholder="请扫描" v-model="orderNo" @search="query" :show-action="false"></u-search>
</view>
</view> -->
<u-form-item label="出库单">
<u-search placeholder="请扫描" :focus="oncefouces" v-model="orderNo" @search="query" :show-action="false"></u-search>
</u-form-item>
<!-- 订单 -->
<!-- <u-form-item label="物料编码">
<jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="aimWl.value" :options="materilist" />
</u-form-item> -->
<u-form-item label="标志卡">
<u-search placeholder="请扫描" :focus="twofouces" v-model="Idcard" @search="querybyidcard" :show-action="false"></u-search>
</u-form-item>
</u-form>
<u-form v-show="materilist.length" v-for="(item, index) in materilist" :key="index" :style="{ marginTop: '1rpx', backgroundColor: item.planNumber <= item.outNumber ? '#4eea9b59' : '#ffffff' }" class="form3">
<view class="list">
<view class="row-list">
<view style="width: 25%" class="list-item"> 出库单: </view>
<view style="width: 80%"> {{ item.produceCode }} </view>
</view>
<view class="row-list">
<view style="width: 25%" class="list-item"> 订单类型: </view>
<view style="width: 80%"> {{ item.userDefined6 }} </view>
</view>
<view class="row-list">
<view style="width: 25%" class="list-item"> 物料编码: </view>
<view style="width: 80%"> {{ item.handlematerialCode }} </view>
</view>
<view class="row-list">
<view style="width: 25%" class="list-item"> 物料名称: </view>
<view style="width: 80%"> {{ item.materialDesc }} </view>
</view>
<view class="row-list">
<view style="width: 25%" class="list-item"> 成本中心: </view>
<view style="width: 80%"> {{ item.userDefined3 }} </view>
</view>
<view class="row-list">
<view class="row-list-item1">
<view class="list-item"> 应出/已出: </view>
<view> {{ item.planNumber }}/{{ item.outNumber }} </view>
</view>
<view class="row-list-item2">
<view class="list-item"> 仓库: </view>
<view> {{ item.locCode }} </view>
</view>
</view>
<view class="row-list">
<view style="width: 25%" class="list-item"> 是否过账: </view>
<jPicker style="border: 2rpx solid; border-radius: 8rpx" @bindpicker="bookTypeChange($event, index)" :disabled="item.planNumber <= item.outNumber ? true : false" sureColor="#ff0000" showKey="label" valKey="value" :val="item.isguozhang.value" :options="reducelist" />
</view>
<view class="row-list">
<view style="width: 25%" class="list-item"> 物料凭证: </view>
<view style="width: 80%"> {{ item.userDefined9 ? item.userDefined9 : '无' }} </view>
</view>
</view>
</u-form>
</view>
<!-- <view style="height: 14rpx"></view> -->
<view class="scroll">
<view v-for="(item, index) in list" :key="item.id">
<u-form style="margin-top: 10rpx" class="form2">
<view class="list">
<view class="rowleft">
<view class="row-list">
<view style="width: 30%" class="list-item"> 标志卡: </view>
<view> {{ item.wlCode }} </view>
</view>
<view class="row-list">
<view style="width: 30%" class="list-item"> 物料编码: </view>
<view> {{ item.handlematerialCode }} </view>
</view>
<view class="row-list">
<view style="width: 30%" class="list-item"> 物料名称: </view>
<view> {{ item.materialDesc }} </view>
</view>
<view class="row-list">
<view class="list-item"> 数量: </view>
<u-input border placeholder="" @blur="confirmNumber(item)" v-model="item.amount" />
</view>
<view a:if="true" class="righttitle">
<view @click.stop="delet(item, index)" class="boder-icon-rigth"> 删除 </view>
</view>
</view>
</view>
</u-form>
</view>
</view>
<view class="bottom-bar">
<u-row class="button-bar">
<!-- 确定 -->
<u-col :span="6">
<u-button @click="onSubmit" type="primary">确认出库</u-button>
</u-col>
<!-- 返回 -->
<u-col :span="6">
<u-button type="error" @click="uni.navigateBack({})"></u-button>
</u-col>
</u-row>
</view>
<u-toast ref="uToast" />
</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 model from './model';
import { session } from '@/store/modules/session';
interface OptionType {
label: string;
value: string;
}
//import { session } from '@/store/modules/session';
@Component({
components: {
jPicker,
},
})
export default class SpecialDelivery extends BasePage {
model = model;
list: any = [];
aimWl = {} as OptionType;
bimWl = {} as OptionType;
cimWl = {} as OptionType;
boxnumber: any = '';
materilist = [];
userDefined1list = [];
warehouselist = [];
Idcard: any = '';
TraysList: any = {};
// remove: any = {};
// async onReady() {
// await this.model.queryLocation();
// this.remove = this.model.WlList[0];
// }
// selectItem(e: any) {
// this.remove = e.pickerName;
// }
orderNo: any = '';
border = true;
orderNoItemList: any = [];
showProduceCodeList: any = [];
itemdetail: any = '';
outNumber: any = 0;
realityaddNumber = 0;
isdisabled = false;
reducelist: any = [
{
label: '否',
value: '0',
},
{
label: '是',
value: '1',
},
];
isguozhang: any = {};
oncefouces = true;
twofouces = false;
bookTypeChange(e: any, index: any) {
console.log(e, index);
this.materilist[index].isguozhang.value = e.pickerName.value;
}
async onReady() {
// await this.model.getwarehouselist();
// this.warehouselist = model.warehouselist;
// const cimWl = this.warehouselist.find((item) => item.value === 'WH02');
// if (cimWl) {
// this.cimWl = cimWl;
// } else {
// this.cimWl = this.warehouselist[0];
// }
}
//
async query() {
if (this.orderNo == '' || this.orderNo.length == 0) {
(this.$refs.uToast as any).show({
title: '请输入出库单号',
// url: '/pages/user/index'
});
return;
}
await this.model.ProductionMaterialRequisition(this.orderNo);
if (model.orderNoItemList) {
this.materilist = [];
this.list = [];
this.materilist = model.orderNoItemList;
this.materilist.forEach((item) => {
item.returnoutNumber = item.outNumber;
item.handlematerialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/));
item.isguozhang = {
label: '否',
value: '0',
};
});
} else {
this.materilist = [];
}
this.twofouces = true;
}
async querybyidcard() {
if (this.list.length) {
let ischongfu = this.list.some((item) => item.wlCode == this.Idcard);
if (ischongfu) {
(this.$refs.uToast as any).show({
title: '请勿重复扫描标志卡',
});
this.Idcard = '';
this.twofouces = false;
this.$nextTick(() => {
this.twofouces = true;
});
return;
}
}
let item = {
factoryCode: session.FactoryCode,
wlCode: this.Idcard,
};
await this.model.getByidcard(item);
if (model.getidcardcode == '200') {
let alreadyList = model.byidcardobj;
alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
alreadyList.produceCode = this.orderNo;
let tianjiaflage = this.materilist.some((item) => item.materialCode == alreadyList.materialCode);
if (tianjiaflage) {
this.materilist.forEach((item) => {
if (item.materialCode == alreadyList.materialCode) {
if (item.userDefined9) {
uni.showModal({
content: '否要进行加料?',
success: (res) => {
if (res.confirm) {
item.outNumber = item.outNumber + alreadyList.amount;
alreadyList.produceCode = item.produceCode;
this.list.push(alreadyList);
} else if (res.cancel) {
//alreadyList.flage = true;
//
}
this.Idcard = '';
this.twofouces = false;
this.$nextTick(() => {
this.twofouces = true;
});
},
});
} else {
item.outNumber = item.outNumber + alreadyList.amount;
alreadyList.produceCode = item.produceCode;
this.list.push(alreadyList);
}
}
});
} else {
(this.$refs.uToast as any).show({
title: '无对应物料',
type: 'waring',
});
this.Idcard = '';
this.twofouces = false;
this.$nextTick(() => {
this.twofouces = true;
});
return;
}
//alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/));
this.Idcard = '';
this.twofouces = false;
this.$nextTick(() => {
this.twofouces = true;
});
}
}
confirmNumber(changeobj) {
let addnumber = 0;
this.list.forEach((item) => {
if (item.materialCode == changeobj.materialCode) {
addnumber += parseFloat(item.amount ? item.amount : '0');
}
});
this.materilist.forEach((item) => {
if (item.materialCode == changeobj.materialCode) {
item.outNumber = item.returnoutNumber + addnumber;
}
});
}
async onSubmit() {
if (this.orderNo == '' || this.orderNo.length == 0) {
(this.$refs.uToast as any).show({
title: '请输入出库单号',
// url: '/pages/user/index'
});
return;
}
// if (this.list.length == 0 || this.list == '') {
// (this.$refs.uToast as any).show({
// title: '',
// // url: '/pages/user/index'
// });
// return;
// }
let guozhannglist = [];
this.materilist.filter((item) => {
if (item.isguozhang.value == '1' || item.planNumber <= item.outNumber) {
guozhannglist.push({ id: item.id, createBy: session.loginName, factoryCode: session.FactoryCode });
}
});
let params = [];
if (this.list.length) {
this.list.map((item) => {
item.createBy = session.loginName;
item.factoryCode = session.FactoryCode;
params.push(item);
});
}
//console.log('list', {orderList: params, gzList: guozhannglist});
await this.model.out({ orderList: params, gzList: guozhannglist });
if (this.model.SubmitCode == '200') {
(this.$refs.uToast as any).show({
title: '成功',
type: 'success',
});
this.mepty();
//this.getlist();
} else {
(this.$refs.uToast as any).show({
title: '失败',
type: 'error',
});
//this.getlist();
}
}
mepty() {
this.list = [];
this.materilist = [];
this.query();
}
delet(deletobj, index) {
this.list.splice(index, 1);
this.materilist.forEach((item) => {
if (item.materialCode == deletobj.materialCode) {
item.outNumber -= deletobj.amount;
}
});
(this.$refs.uToast as any).show({
title: '删除成功',
type: 'success',
});
}
}
</script>
<style>
body {
background-color: rgb(242, 242, 242);
}
</style>
<style lang="scss" scoped>
.page-product-receipt {
background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #f8262c 51%, #d9001b 100%) no-repeat;
background-size: 100% 600rpx;
padding: 118rpx 30rpx 162rpx;
min-height: 100%;
.header {
position: fixed;
top: 0rpx;
left: 0;
right: 0;
z-index: 99;
display: flex;
height: 120rpx;
line-height: 88rpx;
color: #fff;
font-size: 34rpx;
font-weight: 500;
text-align: center;
padding: 45rpx 0rpx 0rpx;
.title {
flex: 3;
}
.left,
.right {
flex: 1;
}
.icon {
display: flex;
justify-content: center;
align-items: center;
width: 88rpx;
height: 88rpx;
}
}
// .fiexdcontent {
// position: fixed;
// width: 92%;
// box-shadow: 0 0 14px 0 rgb(128 128 128 / 46%);
// z-index: 100;
// }
.form {
background-color: #fff;
padding: 15rpx;
border-radius: 10rpx;
//box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
.u-form-item {
padding: 20rpx 0;
line-height: 35rpx;
.Transfer {
width: 280rpx;
height: 64rpx;
background: rgb(242, 242, 242);
border-radius: 110rpx;
}
}
.single {
width: 100%;
height: 60rpx;
display: flex;
.single-left {
width: 80%;
height: 100%;
display: flex;
view {
width: 142rpx;
height: 100%;
line-height: 55rpx;
}
}
.single-right {
button {
// margin-top: 15rpx;
width: 140rpx;
height: 70rpx;
background-color: #fa3534;
}
}
}
.row {
display: flex;
flex-direction: row;
justify-content: space-around;
flex: 1;
}
}
.form3 {
background-color: #fff;
padding: 20rpx 20rpx 20rpx;
border-radius: 10rpx;
height: 360rpx;
overflow: scroll;
margin-bottom: 6rpx;
//box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
//color: #8d8989;
// .list {
// display: flex;
// flex-direction: row;
// }
.row-list {
display: flex;
flex-direction: row;
justify-content: space-between;
.row-list-item {
display: flex;
flex-direction: row;
justify-content: space-between;
width: 40%;
}
.row-list-item1 {
display: flex;
flex-direction: row;
justify-content: space-between;
width: 50%;
}
.row-list-item2 {
display: flex;
flex-direction: row;
justify-content: space-between;
width: 40%;
}
.list-item {
display: flex;
flex-direction: row;
// flex: 1;
}
}
.righttitle {
display: flex;
justify-content: flex-end;
.boder-icon-rigth {
border: 1rpx solid #fa3534;
width: 130rpx;
text-align: center;
background: #fa3534;
color: #ffffff;
margin-top: 10px;
}
}
}
.form4 {
background-color: #fff;
padding: 18rpx;
border-radius: 10rpx;
margin-top: 2rpx;
.u-input__input {
min-height: 36px;
}
}
.scroll {
// margin-top: 2rpx;
// height: 680rpx;
// overflow: scroll;
// position: absolute;
// width: 92%;
// top: 740rpx;
// /* bottom: 40px; */
// overflow: auto;
// background-color: #f2f2f2;
.form2 {
background-color: #fff;
padding: 20rpx 20rpx 20rpx;
border-radius: 10rpx;
box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2);
color: #8d8989;
.list {
// display: flex;
// flex-direction: row;
.rowleft {
// width: 80%;
.row-list {
display: flex;
flex-direction: row;
justify-content: space-between;
.row-list-item {
display: flex;
flex-direction: row;
justify-content: space-between;
width: 40%;
}
.list-item {
display: flex;
flex-direction: row;
//flex: 1;
}
}
.righttitle {
display: flex;
justify-content: flex-end;
.boder-icon-rigth {
border: 1rpx solid #fa3534;
width: 130rpx;
text-align: center;
background: #fa3534;
color: #ffffff;
margin-top: 10px;
}
}
}
.rowright {
width: 20%;
display: flex;
justify-content: right;
.righttitle {
width: 60%;
background-color: #8d898947;
color: red;
text-align: center;
/* margin: auto; */
height: 100%;
line-height: 70rpx;
}
}
}
// .righttitle {
// display: flex;
// justify-content: flex-end;
// .boder-icon-rigth {
// border: 1rpx solid #fa3534;
// width: 130rpx;
// text-align: center;
// background: #fa3534;
// color: #ffffff;
// margin-top: 10px;
// }
// .zhuangtai {
// background: #a7a0a04a;
// width: 224rpx;
// margin-right: -27rpx;
// border: 2rpx solid #a7a0a04a;
// border-radius: 12rpx;
// text-align: center;
// margin-bottom: 10rpx;
// }
// .zhuangtai[data-state='1'] {
// color: green;
// }
// .zhuangtai[data-state='0'] {
// color: blue;
// }
// }
}
}
.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 {
}
.photoList {
display: flex;
padding-top: 12rpx;
.chooseBtn {
width: 202rpx;
height: 202rpx;
background: #fafafa;
border-radius: 12rpx;
border: 2rpx dashed #e2e2e2;
display: flex;
justify-content: center;
align-items: center;
.inner {
text-align: center;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.desc {
font-size: 28rpx;
font-weight: 400;
color: #24252a;
line-height: 40rpx;
}
.img {
width: 50rpx;
height: 50rpx;
margin-bottom: 6rpx;
}
}
.photoBox {
width: 202rpx;
height: 202rpx;
background: #fafafa;
border-radius: 12rpx;
position: relative;
.closeBtn {
position: absolute;
top: -12rpx;
right: -12rpx;
z-index: 2;
width: 36rpx;
height: 36rpx;
.img {
width: 36rpx;
height: 36rpx;
}
}
.img {
width: 202rpx;
height: 202rpx;
border-radius: 12rpx;
}
}
.itemBox {
flex: 0 0 202rpx;
margin-right: 20rpx;
&:last-child {
margin-right: 0;
}
}
// /deep/ .remarksBox textarea {
// font-size: 24rpx;
// }
}
}
</style>

@ -0,0 +1,106 @@
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: 'page.Raw.SpecialDelivery',
})
export class SpecialDelivery extends VuexModule {
orderNoItemList: any = [];
@MutationAction
async ProductionMaterialRequisition(orderNo: any) {
const result: any = await http.post(url.lanjuwms.raw.SpecialDelivery.ProductionMaterialRequisitionSC, {
// headers: {
// poolName: session.PoolName,
// },
produceCode: orderNo,
factoryCode: session.FactoryCode,
});
// http.defaults.headers.common['Accept-Language'] = session.PoolName;
const orderNoItemList = result.data.map((element: any) => ({
label: element.materialDesc,
value: element.materialCode,
...element,
}));
return { orderNoItemList };
}
information: any = [];
@MutationAction
async queryinformation(item: any) {
const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.ProductionMaterialRequisition, {
...item,
factoryCode: session.FactoryCode,
});
const information = result.data.map((element: any) => ({
label: element.userDefined1,
value: element.userDefined1,
...element,
}));
return { information };
}
TraysList: any = {};
@MutationAction
async showTrays(item: any) {
const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.ProductionMaterialRequisition, {
...item,
factoryCode: session.FactoryCode,
});
const TraysList = result.data[0];
return { TraysList };
}
SubmitCode: any = '';
selloutconntraydata: any = {};
@MutationAction
async selloutconntray(params: any) {
const result: any = await http.post(url.lanjuwms.raw.ProductionREQ.ProductionMaterialRequisitionsn, {
sn: params,
factoryCode: session.FactoryCode,
});
const SubmitCode = result.code;
const selloutconntraydata = result.data;
return { SubmitCode, selloutconntraydata };
}
@MutationAction
async deleteTray(item: any) {
console.log(item);
const result: any = await http.delete(url.lanjuwms.product.SaleOutWH.deleteTray + '/' + item.barcode);
const SubmitCode = result.code;
return { SubmitCode };
}
@MutationAction
async out(params: any) {
const result: any = await http.post(url.lanjuwms.raw.SpecialDelivery.NewConMaterialOutSCNew, params);
const SubmitCode = result.code;
return { SubmitCode };
}
warehouselist: any = [];
@MutationAction
async getwarehouselist() {
const result = await http.post(url.lanjuwms.raw.ProductionREQ.warehouselist, {
factoryCode: session.FactoryCode,
});
const warehouselist = result.data.map((element: any) => ({
label: element.warehouseName,
value: element.warehouseCode,
...element,
}));
return { warehouselist };
}
///扫描标志卡
getidcardcode: any = '';
byidcardobj: any = {};
@MutationAction
async getByidcard(data: any) {
const result: any = await http.post(url.lanjuwms.raw.ReceivePO.SweepMaterialCardSC, data);
const getidcardcode = result.code;
const byidcardobj = result.data;
return { getidcardcode, byidcardobj };
}
}
export default getModule(SpecialDelivery);

@ -178,6 +178,10 @@ export const url = {
ArrivalRecord: {
getArrivalRecord: qianzhuione + '/wms/WmsToWCSmission/ArrivalRegistrationreader',
},
SpecialDelivery: {
ProductionMaterialRequisitionSC: qianzhuione + '/wms/WmsToWCSmission/listOdsProcureOutOrderTS',
NewConMaterialOutSCNew: qianzhuione + '/wms/WmsToWCSmission/OdsProcureOutOrderTSCK',
},
},
WhiteManagement: {
WhiteInstorage: {

Loading…
Cancel
Save