diff --git a/src/manifest.json b/src/manifest.json
index 7e28642..6564bb1 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "HaierGWMS",
+ "name" : "HaierWMS",
"appid" : "__UNI__306D001",
"description" : "",
"versionName" : "0.0.1",
diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
index 5fa171e..fbff126 100644
--- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
+++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue
@@ -16,8 +16,8 @@
-
-
+
+
@@ -25,9 +25,9 @@
-
-
-
+
+
+
@@ -55,17 +55,17 @@
-
+
{{ $t('message.detailed') }}
-
+
-
+
{{ $t('message.Posting') }}
@@ -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 = '';
diff --git a/src/pages/product/outbound/stoOutbound/model.ts b/src/pages/product/outbound/stoOutbound/model.ts
index 4db4670..cd63685 100644
--- a/src/pages/product/outbound/stoOutbound/model.ts
+++ b/src/pages/product/outbound/stoOutbound/model.ts
@@ -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 }
+ }
/**
* 扫条码
*/
diff --git a/src/pages/product/warehouse/wholeTransfer/index.vue b/src/pages/product/warehouse/wholeTransfer/index.vue
index d3ac1f8..bc477a5 100644
--- a/src/pages/product/warehouse/wholeTransfer/index.vue
+++ b/src/pages/product/warehouse/wholeTransfer/index.vue
@@ -10,7 +10,8 @@
-
+
+
{{ $t('message.generate') }}
@@ -20,24 +21,24 @@
-
+
-
+
-
-
-
-
-
+
+
+
+
+
@@ -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 = {
@@ -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();
diff --git a/src/pages/product/warehouse/wholeTransfer/model.ts b/src/pages/product/warehouse/wholeTransfer/model.ts
index 31937f2..43de861 100644
--- a/src/pages/product/warehouse/wholeTransfer/model.ts
+++ b/src/pages/product/warehouse/wholeTransfer/model.ts
@@ -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) {
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index b0d6992..9cfc3d8 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -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);
});
diff --git a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
index 4d7dfc2..eb9ea74 100644
--- a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
+++ b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
@@ -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,
diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
index 063b6f4..dc48428 100644
--- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
+++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
@@ -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,
diff --git a/src/utils/url.ts b/src/utils/url.ts
index 7ff1abb..c7e4d69 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -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',
},
diff --git a/tsconfig.json b/tsconfig.json
index d4dc543..1ac7194 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,7 +20,6 @@
"@dcloudio/types",
"miniprogram-api-typings",
"mini-types",
- "@types/html5plus"
],
"paths": {
"@/*": [