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

退扫，发货等

Browse Source
master
hou 3 years ago
parent 048334b49e
commit 06205fae00
10 changed files with 95 additions and 34 deletions
Show Stats Download Patch File Download Diff File

2
src/manifest.json
Unescape Escape View File

@ -1,5 +1,5 @@
{
"name" : "HaierGWMS",
"name" : "HaierWMS",
"appid" : "__UNI__306D001",
"description" : "",
"versionName" : "0.0.1",

28
src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
Unescape Escape View File

@ -16,8 +16,8 @@
<u-form-item :label="$t('message.product_TotalNumber')">
<u-input v-model="model.orderInInfo.stoAmount" :disabled="true" type="number" placeholder="" />
</u-form-item>
<!-- 行项目 -->
<u-form-item :required="true" :label="$t('message.Line')">
<!-- 成品编码 -->
<u-form-item :required="true" :label="$t('message.product_FGCode')">
<u-input v-model="form.rowItem" type="select" @click="materialCodeSelect = true" :placeholder="$t('message.po_PleaseInput')" />
<u-select :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="materialCodeSelect" :list="model.materielList" @confirm="materialConfirm"></u-select>
</u-form-item>
@ -25,9 +25,9 @@
<u-form-item :label="$t('message.product_FGDes')">
<u-input :disabled="true" v-model="form.productDescZh" placeholder="" style="overflow: hidden" />
</u-form-item>
<!-- 成品编码 -->
<u-form-item :label="$t('message.product_FGCode')">
<u-input :disabled="true" v-model="form.productCode" placeholder="" />
<!-- 行项目 -->
<u-form-item :label="$t('message.Line')">
<u-input :disabled="true" v-model="form.rowItem" placeholder="" />
</u-form-item>
<!-- 物料总数 -->
<u-row gutter="0">
@ -55,17 +55,17 @@
<view class="bottom-bar">
<u-row class="button-bar">
<!-- Guoshuang 详细跳转要改，调接口 -->
<u-col :span="4">
<u-col :span="6">
<u-button type="warning" @click="detailed">{{ $t('message.detailed') }}</u-button>
</u-col>
<u-col :span="4">
<!-- <u-col :span="4">
<u-button type="primary" @click="BackSweep">{{ $t('message.BackSweep') }}</u-button>
</u-col>
</u-col> -->
<!-- <u-col :span="4">
<u-button type="error" @click="resetHandle">{{ $t('message.product_Empty') }}</u-button>
</u-col> -->
<!-- Guoshuang 出库要改，入参 -->
<u-col :span="4">
<u-col :span="6">
<u-button type="primary" @click="Posting">{{ $t('message.Posting') }}</u-button>
</u-col>
<!-- <u-col :span="3">-->
@ -376,6 +376,16 @@ export default class stoOutboundDom extends BasePage {
//this.$table.onCheckAllTap();
uni.showToast({ icon: 'success', title: 'success' });
}
if(this.model.code == '2'){
let params = {
barcode: this.form.barCode,
loginName: session.loginName,
keepBy: session.loginName,
factoryCode: session.factoryCode,
order3: this.form.orderNo,
}
await this.model.delCode(params)
}
});
// this.form.orderNo = '';
this.form.barCode = '';

9
src/pages/product/outbound/stoOutbound/model.ts
Unescape Escape View File

@ -35,6 +35,7 @@ export class ReturningModule extends VuexModule {
* 订单号查询结果
*/
orderInInfo: OrderInInfo = new OrderInInfo();
resCode:any = ''
//记账按钮的code码
code = '';
DNcode: any = '';
@ -112,7 +113,13 @@ export class ReturningModule extends VuexModule {
const orderInInfo = result.data[0] || {};
return { orderInInfo, materielList, DNcode };
}
//退扫
@MutationAction
async delCode(params:any = {}){
const res:any = await http.post(url.outbound.stoOutbound.del,params)
const resCode = res.code
return { resCode }
}
/**
* 扫条码
*/

42
src/pages/product/warehouse/wholeTransfer/index.vue
Unescape Escape View File

@ -10,7 +10,8 @@
<u-form class="form" ref="form" :model="form" label-width="180rpx">
<!-- 移库码 -->
<u-form-item :label="$t('message.Transfer')">
<u-input v-model="userDefined4" placeholder="" class="Transfer" />
<!-- <u-input v-model="userDefined4" placeholder="" class="Transfer" /> -->
<u-search :placeholder="$t('message.barcode')" class="Transfer" v-model.trim="userDefined4" @search="QueryHistory" :show-action="false"></u-search>
<u-button type="primary" style="height: 60rpx; margin-left: 20rpx" @click="generate">{{ $t('message.generate') }}</u-button>
</u-form-item>
<!-- 已扫 -->
@ -20,24 +21,24 @@
<!-- 成品编码 -->
<u-form-item :label="$t('message.product_FGCode')">
<!-- <u-input :disabled="true" v-model="model.orderInInfo.productCode" placeholder="" /> -->
<jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.WlList" />
<jPicker sureColor="#ff0000" @bindpicker="selectItem" showKey="value" valKey="value" :val="remove.value" :options="model.removeMaterialList" />
</u-form-item>
<!-- 成品描述 -->
<u-form-item :label="$t('message.product_FGDes')">
<u-input :disabled="true" v-model="model.orderInInfo.productDescZh" placeholder="" style="overflow: hidden" />
<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="model.orderInInfo.qty" placeholder="" />
</u-form-item>
<!-- 库位 -->
<u-form-item :label="$t('message.product_Location')">
<u-input :disabled="true" v-model="model.orderInInfo.locCode" placeholder="" />
<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" />
@ -85,7 +86,9 @@ export default class productCheckReceipt extends BasePage {
aimWl:{} as OptionType,
productCode: '',
};
remove:any = {}
userDefined4: any = '';
histroyItem:any = {}
aimWlSelect = false;
cboPlaceSelect = false;
rules: VFormRules<any> = {
@ -99,6 +102,14 @@ export default class productCheckReceipt extends BasePage {
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
}
})
}
//扫描条码回车
async query() {
if (this.form.productCode == ' ' || this.form.productCode.length == 0) {
@ -113,6 +124,19 @@ export default class productCheckReceipt extends BasePage {
});
}
}
//查询已扫物料
async QueryHistory(){
if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
this.customToast(this.$t('message.barcode') as string);
return;
}
let params = {
loginName: session.loginName,
factoryCode: session.factoryCode,
proMoveCode: this.userDefined4,
}
await this.model.QueryHistory(params)
}
//页面初始化
async onReady() {
this.$form.setRules(this.rules);
@ -172,7 +196,7 @@ export default class productCheckReceipt extends BasePage {
if (model.code == '1') {
this.customToast(this.$t('message.Warehouse_Tip9') as string);
// this.form.productCode = '';
model.empty();
this.model.empty();
this.query()
// setTimeout(() => {
// this.$forceUpdate();

18
src/pages/product/warehouse/wholeTransfer/model.ts
Unescape Escape View File

@ -31,6 +31,8 @@ export class wholeTransfer extends VuexModule {
userDefined: any = '';
detailedList: any;
code = '';
removeList:any = []
removeMaterialList:any = []
/**
* 物料型号类型
*/
@ -127,6 +129,22 @@ export class wholeTransfer extends VuexModule {
let userDefined: any = res.data;
return { userDefined };
}
//查询已扫物料
@MutationAction
async QueryHistory(params: any = {}) {
let res: any = await http.post(url.warehouse.rowTransfer.queryGroupLis, params);
console.log('res>>>>>>>>>>>>>>>>',res)
const removeList:any = res.data
const removeMaterialList:any = []
res.data.forEach((item:any) =>{
let arr:any = {
value:item.materialCode,
laber:item.materialCode,
}
removeMaterialList.push(arr)
})
return { removeList,removeMaterialList };
}
//查询明细
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
async querydetaildlist(content: any) {

3
src/pages/raw/handover/returning/index.vue
Unescape Escape View File

@ -189,7 +189,8 @@ export default class returningDom extends BasePage {
res.forEach((item: any) => {
let pickerName: any = {};
pickerName.label = item.locationCode;
pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
// pickerName.value = item.locationCode + '(' + item.sendSpot + ')';
pickerName.value = item.locationCode;
pickerName.sendSpot = item.sendSpot;
this.Location.push(pickerName);
});

12
src/pages/raw/ingoods/dnReceipt/ImportDN.vue
Unescape Escape View File

@ -276,12 +276,12 @@ export default class dnReceiptDom extends BasePage {
return;
}
let isTrue = true;
this.DNReceivingList[this.everyIndex].wllist.forEach((item: any) => {
if (item.wlCode == this.wl.label && item.receiptAmount == this.receiptAmount) {
this.customToast(this.$t('message.repeatedly') as any);
return (isTrue = false);
}
});
// this.DNReceivingList[this.everyIndex].wllist.forEach((item: any) => {
// if (item.wlCode == this.wl.label && item.receiptAmount == this.receiptAmount) {
// this.customToast(this.$t('message.repeatedly') as any);
// return (isTrue = false);
// }
// });
if (isTrue == true) {
this.LocationList.push({
...this.every,

12
src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
Unescape Escape View File

@ -277,12 +277,12 @@ export default class dnReceiptDom extends BasePage {
return;
}
let isTrue = true;
this.DNReceivingList[this.everyIndex].wllist.forEach((item: any) => {
if (item.wlCode == this.wl.label && item.receiptAmount == this.receiptAmount) {
this.customToast(this.$t('message.repeatedly') as any);
return (isTrue = false);
}
});
// this.DNReceivingList[this.everyIndex].wllist.forEach((item: any) => {
// if (item.wlCode == this.wl.label && item.receiptAmount == this.receiptAmount) {
// this.customToast(this.$t('message.repeatedly') as any);
// return (isTrue = false);
// }
// });
if (isTrue == true) {
this.LocationList.push({
...this.every,

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

@ -127,6 +127,7 @@ export const url = {
close:'/wmspda/material/outsourcing/close',
// Bookkeeping: '/wmspda/fg/confirmMove',
checkScan: '/wmspda/fg/getMaterialByCode',
del:'/wmspda/fg/scanBarcodeDN/del',
getMaterialByCode: '/wmspda/fg/getMaterialByCode',
queryOrder: '/wmspda/material/outsourcing/into/queryOrder',
submit: '/wmspda/material/outsourcing/into/materialComplete',
@ -196,6 +197,7 @@ export const url = {
commit: '/wmspda/fg/confirmMove',
getMaterialByCode: '/wmspda/fg/getMaterialByCode',
getCode: '/wmspda/fg/getCpMoveBatchNo',
queryGroupLis:'/wmspda/fg/queryGroupListByMoveCode',
//查询明细
queryListByMoveCode: '/wmspda/fg/queryListByMoveCode',
},

1
tsconfig.json
Unescape Escape View File

@ -20,7 +20,6 @@
"@dcloudio/types",
"miniprogram-api-typings",
"mini-types",
"@types/html5plus"
],
"paths": {
"@/*": [

Write Preview
Loading…
Cancel
Save