Browse Source

非生产出库、非生产入库

dev_pda
李俊城 1 year ago
parent
commit
90fa922ae3
  1. 15
      fe/PDA/mycomponents/coms/task/comUnProduce.vue
  2. 2
      fe/PDA/pages/task/unProducePick.vue
  3. 140
      fe/PDA/pages/task/unProducePickDetail.vue
  4. 2
      fe/PDA/pages/task/unProduceReturn.vue
  5. 355
      fe/PDA/pages/task/unProduceReturnDetail.vue
  6. 1
      fe/PDA/static/menus/dy_menu/menu_pick.svg
  7. 1
      fe/PDA/static/menus/dy_menu/menu_return.svg

15
fe/PDA/mycomponents/coms/task/comUnProduce.vue

@ -10,14 +10,17 @@
<view class="margin_xs_bottom" style="clear: both;">
<view class="label_order">
<image class="icon_normal" src="@/static/icons_ui/icon_apply_num.svg"></image>
<text>{{dataContent.materialRequestNumber}}</text>
<text v-if="fromType=='pick'">{{dataContent.unplannedIssueRequestNumber}}</text>
<!-- <text>申请单{{dataContent.materialRequestNumber}}</text> -->
<text v-else>{{dataContent.unplannedReceiptRequestNumber}}</text>
</view>
<view class="label_order">
<!-- <view class="label_order">
<image class="icon_normal" src="@/static/icons_ui/icon_prod_line.svg"></image>
<text>{{dataContent.prodLine}}</text>
<!-- <text>生产线{{dataContent.prodLine}}</text> -->
</view>
<text>生产线{{dataContent.prodLine}}</text>
</view> -->
</view>
<view class="uni-flex uni-row receipt_bot">
<view class="label_order">
@ -58,6 +61,10 @@
dataContent: {
type: Object,
value: null
},
fromType:{
type: String,
value: "pick"
}
},
filters: {

2
fe/PDA/pages/task/unProducePick.vue

@ -5,7 +5,7 @@
<win-empty-view v-if="dataList.length==0"></win-empty-view>
<view hover-class="uni-list-cell-hover" v-for="(item, index) in dataList" :key="item.id"
@click="openDetail(item)">
<comUnProduce :dataContent="item"></comUnProduce>
<comUnProduce :dataContent="item" fromType ="pick"></comUnProduce>
</view>
<uni-load-more :status="loadingType" v-if="dataList.length>0" />
<win-scan-button @goScan='openScanPopup'></win-scan-button>

140
fe/PDA/pages/task/unProducePickDetail.vue

@ -115,7 +115,7 @@
takeIssueJob,
cancelTakeIssueJob,
finshUnProducePickJob,
issueBalances
getBalancesByFilter
} from '@/api/index.js';
import {
getJobStatuStyle,
@ -188,13 +188,12 @@
// }
this.getDetail();
},
onReady() {
},
onReady() {},
//
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
}else if(e.index === 1){
} else if (e.index === 1) {
window.location.reload();
}
},
@ -309,31 +308,31 @@
dyIssue(result, scaned) {
let that = this;
var itemCode = that.details.find(r => {
return r.itemCode === result.data.itemCode&&
r.scaned === scaned
return r.itemCode === result.data.itemCode &&
r.scaned === scaned
})
if (itemCode == undefined) {
that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中');
}else {
} else {
//
var itemCode1 = that.details.find(r => {
return r.itemCode === result.data.itemCode&&
r.recommendPackingCode === result.data.code
return r.itemCode === result.data.itemCode &&
r.recommendPackingCode === result.data.code
r.scaned === scaned
})
//
if(itemCode1 == undefined){
if (itemCode1 == undefined) {
var itemCode2 = that.details.find(r => {
return r.itemCode === result.data.itemCode&&
r.recommendLot === result.data.lot
&&r.scaned === scaned
return r.itemCode === result.data.itemCode &&
r.recommendLot === result.data.lot &&
r.scaned === scaned
})
//
if(itemCode2==undefined){
if (itemCode2 == undefined) {
//
console.log("零件号相同、箱码不相同、批次不相同")
setTimeout(res => {
showConfirmMsg(itemCode.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => {
showConfirmMsg(itemCode.recommendPackingCode + '未执行先进先出或不是最先批次,是否继续?', confirm => {
if (confirm) {
that.currentItem = itemCode;
that.afterScanPackLabel(result);
@ -343,7 +342,7 @@
});
}, 100)
}else {
} else {
console.log("零件号相同、箱码不相同、批次相同")
//
that.currentItem = itemCode2;
@ -351,19 +350,20 @@
}
}else {
} else {
//
var itemCode3 = that.details.find(r => {
return r.itemCode === result.data.itemCode&&
r.recommendPackingCode === result.data.code&&
r.recommendLot === result.data.lot
&&r.scaned === scaned
return r.itemCode === result.data.itemCode &&
r.recommendPackingCode === result.data.code &&
r.recommendLot === result.data.lot &&
r.scaned === scaned
})
if(itemCode3==undefined){
if (itemCode3 == undefined) {
//
console.log("零件号相同、箱码相同、批次不同")
setTimeout(res => {
showConfirmMsg(itemCode1.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => {
showConfirmMsg(itemCode1.recommendPackingCode + '未执行先进先出或不是最先批次,是否继续?',
confirm => {
if (confirm) {
that.currentItem = itemCode1;
that.afterScanPackLabel(result);
@ -373,7 +373,7 @@
});
}, 100)
}else {
} else {
console.log("零件号相同、箱码相同、批次相同")
//
that.currentItem = itemCode3;
@ -382,66 +382,6 @@
}
}
// that.currentItem = that.details.find(r => {
// return r.itemCode === result.data.itemCode &&
// r.recommendPackingCode === result.data.code &&
// r.recommendLot === result.data.lot &&
// r.scaned === scaned
// });
// //
// if (that.currentItem === undefined) {
// var itemCode = that.details.find(res => {
// return res.itemCode === result.data.itemCode &&
// res.scaned === scaned
// })
// //
// if (itemCode != undefined) {
// var lot = that.details.find(res => {
// return res.itemCode === result.data.itemCode &&
// res.recommendLot === result.data.lot &&
// res.scaned === scaned
// })
// if (lot != undefined) {
// //
// that.currentItem = lot;
// that.afterScanPackLabel(result);
// } else {
// //
// //
// setTimeout(res => {
// showConfirmMsg(',?', confirm => {
// if (confirm) {
// that.currentItem = itemCode;
// that.afterScanPackLabel(result);
// } else {
// that.scanPopupGetFocus();
// }
// });
// }, 100)
// }
// } else {
// //
// var lot = that.details.find(res => {
// return res.recommendLot === result.data.lot &&
// res.scaned === scaned
// })
// //
// if (lot != undefined) {
// //
// that.showScanMessage('');
// } else {
// //,
// that.showScanMessage('');
// }
// }
// } else {
// that.afterScanPackLabel(result);
// }
},
afterScanPackLabel(result) {
@ -472,15 +412,15 @@
itemCode: result.data.itemCode,
lot: result.data.lot,
inventoryStatus: 2, //2
locationTypes: [2, 3],
locationTypes: [2],
sortBy: 'PackingCode asc'
};
issueBalances(params)
getBalancesByFilter(params)
.then(res => {
if (res.totalCount === 0) {
this.showScanMessage('按零件号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' +
result
.data.lot + '】在【原料库、半成品库】未查询到库存信息');
.data.lot + '】在【原料库】未查询到库存信息');
} else {
callback(res);
}
@ -523,7 +463,7 @@
item.scanPackingCode = this.currentScanLebel.data.code;
item.scanLot = this.currentScanLebel.data.lot;
item.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN;
item.worker = localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN;
item.uom = balanceItem.uom;
this.details.sort(compareDesc('scanDate')); //
@ -553,12 +493,12 @@
submit() {
let that = this;
if (that.datacontent.details.length === 0) {
this.showMessage('该任务没有要上架的零件');
this.showMessage('该任务没有选择的零件');
return;
}
let checkItems = that.details.filter(r => r.scaned === true);
if (checkItems.length < that.details.length) {
showConfirmMsg('还有未扫描的零件,是否继续发料', confirm => {
showConfirmMsg('还有未扫描的零件,是否提交?', confirm => {
if (confirm) {
that.finsh();
}
@ -601,7 +541,7 @@
items.forEach(r => {
packingCodes += r.recommendPackingCode + ','
})
showConfirmMsg('以下箱码对应的实际箱码为空,是否要继续料?【' + packingCodes + "】", confirm => {
showConfirmMsg('以下箱码对应的实际箱码为空,是否要继续料?【' + packingCodes + "】", confirm => {
if (confirm) {
that.finsh();
} else {
@ -622,7 +562,8 @@
that.datacontent.completeUserId = localStorage.getItem('userId')
that.datacontent.completeUserName = localStorage.getItem('userName_CN')
that.datacontent.completeTime = getCurrDateTime();
that.datacontent.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN;
that.datacontent.worker = localStorage.userName_CN == "" ? localStorage.userName : localStorage
.userName_CN;
that.datacontent.details = that.details;
let params = JSON.stringify(that.datacontent);
finshUnProducePickJob(that.id, params)
@ -641,11 +582,12 @@
//
backJobList(delay) {
setTimeout(() => {
uni.navigateTo({
url: './unProducePick'
})
}, 1000)
uni.navigateBack()
// setTimeout(() => {
// uni.navigateTo({
// url: './unProducePick'
// })
// }, 1000)
},
clear() {
@ -717,12 +659,12 @@
},
qtyChanged(value, item, index) {
if (value <= 0) {
this.showMessage('料数量不能小于或等于0')
this.showMessage('料数量不能小于或等于0')
item.handledQty = item.defaultHandleQty
this.$refs['comNumberBox_' + index][0].setValue(item.handledQty);
} else if (value > item.defaultHandleQty) {
item.handledQty = item.defaultHandleQty
this.showMessage('料数量不能大于库存数量:' + item.handledQty)
this.showMessage('料数量不能大于库存数量:' + item.handledQty)
this.$refs['comNumberBox_' + index][0].setValue(item.handledQty);
}
},

2
fe/PDA/pages/task/unProduceReturn.vue

@ -5,7 +5,7 @@
<win-empty-view v-if="dataList.length==0"></win-empty-view>
<view hover-class="uni-list-cell-hover" v-for="(item, index) in dataList" :key="item.id"
@click="openDetail(item)">
<comUnProduce :dataContent="item"></comUnProduce>
<comUnProduce :dataContent="item" fromType="return"></comUnProduce>
</view>
<uni-load-more :status="loadingType" v-if="dataList.length>0" />
<win-scan-button @goScan='openScanPopup'></win-scan-button>

355
fe/PDA/pages/task/unProduceReturnDetail.vue

@ -70,13 +70,13 @@
</uni-th>
</uni-tr>
<uni-tr>
<uni-th width="60">库位</uni-th>
<uni-th width="60">目标库位</uni-th>
<uni-th width="100" align="center">
<view class="text_black">{{ item.recommendFromLocationCode }}</view>
<view class="text_black">{{ item.recommendToLocationCode }}</view>
</uni-th>
<uni-th width="100" align="center">
<view class="text_black" v-if="item.scaned">
{{ item.handledFromLocationCode }}
{{ item.toLocationCode }}
</view>
</uni-th>
</uni-tr>
@ -84,8 +84,12 @@
</view>
</view>
</view>
<view class="choose_marked" v-if="item.scaned">
<image src="@/static/image_marked.svg"></image>
<view v-if="item.scaned" class="choose_marked_count"
style="background-color: #5FCB94; opacity: 0.65">
<view class="" style="background-color: #5FCB94; width: 200rpx;height: 300rpx;">
</view>
<!-- <image src="@/static/image_marked.svg"></image> -->
</view>
</view>
</view>
@ -106,11 +110,11 @@
<script>
import {
getUnProducePickDetail,
getUnProduceReturnDetail,
takeIssueJob,
cancelTakeIssueJob,
finshUnProduceReturnJob,
issueBalances
getBalancesByFilter
} from '@/api/index.js';
import {
getJobStatuStyle,
@ -183,13 +187,12 @@
// }
this.getDetail();
},
onReady() {
},
onReady() {},
//
onNavigationBarButtonTap(e) {
if (e.index === 0) {
goHome();
}else if(e.index === 1){
} else if (e.index === 1) {
window.location.reload();
}
},
@ -231,7 +234,7 @@
let params = {
id: that.id,
};
getUnProducePickDetail(params)
getUnProduceReturnDetail(params)
.then(item => {
console.log('item', item);
that.datacontent = item;
@ -261,9 +264,10 @@
},
getScanResult(result) {
//
let item = this.details.find(r => r.recommendPackingCode === result.data.packingCode && r
.scanPackingCode != result.data.packingCode);
if (item != undefined && item.scaned) {
showConfirmMsg('扫描的箱码【' + result.data.packingCode + '】匹配到任务中的【' + item.scanPackingCode +
'】箱,是否要重新匹配任务中的【' + item.scanPackingCode + '】箱?',
@ -282,6 +286,29 @@
this.handledPackCode(result, false);
}
this.scrollToTop();
// //
// let item = this.details.find(r => r.recommendPackingCode === result.data.packingCode && r
// .scanPackingCode != result.data.packingCode);
// if (item != undefined && item.scaned) {
// showConfirmMsg('' + result.data.packingCode + '' + item.scanPackingCode +
// ',' + item.scanPackingCode + '?',
// confirm => {
// if (confirm) {
// this.handledPackCode(result, true);
// } else {
// return;
// }
// })
// } else {
// if (this.allCount === this.scanCount) {
// this.showMessage("");
// return;
// }
// this.handledPackCode(result, false);
// }
// this.scrollToTop();
},
//
@ -304,41 +331,44 @@
dyIssue(result, scaned) {
let that = this;
var itemCode = that.details.find(r => {
return r.itemCode === result.data.itemCode&&
r.scaned === scaned
return r.itemCode === result.data.itemCode &&
r.scaned === scaned
})
if (itemCode == undefined) {
that.showScanMessage('所扫描的箱码【' + result.data.code + '】对应的物料【' + result.data.itemCode + '】不在任务中');
}else {
} else {
//
var itemCode1 = that.details.find(r => {
return r.itemCode === result.data.itemCode&&
r.recommendPackingCode === result.data.code
return r.itemCode === result.data.itemCode &&
r.recommendPackingCode === result.data.code
r.scaned === scaned
})
//
if(itemCode1 == undefined){
if (itemCode1 == undefined) {
var itemCode2 = that.details.find(r => {
return r.itemCode === result.data.itemCode&&
r.recommendLot === result.data.lot
&&r.scaned === scaned
return r.itemCode === result.data.itemCode &&
r.recommendLot === result.data.lot &&
r.scaned === scaned
})
//
if(itemCode2==undefined){
if (itemCode2 == undefined) {
//
console.log("零件号相同、箱码不相同、批次不相同")
setTimeout(res => {
showConfirmMsg(itemCode.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => {
if (confirm) {
that.currentItem = itemCode;
that.afterScanPackLabel(result);
} else {
that.scanPopupGetFocus();
}
});
}, 100)
}else {
that.currentItem = itemCode;
that.afterScanPackLabel(result);
// setTimeout(res => {
// showConfirmMsg(itemCode.recommendPackingCode+',?', confirm => {
// if (confirm) {
// that.currentItem = itemCode;
// that.afterScanPackLabel(result);
// } else {
// that.scanPopupGetFocus();
// }
// });
// }, 100)
} else {
console.log("零件号相同、箱码不相同、批次相同")
//
that.currentItem = itemCode2;
@ -346,29 +376,31 @@
}
}else {
} else {
//
var itemCode3 = that.details.find(r => {
return r.itemCode === result.data.itemCode&&
r.recommendPackingCode === result.data.code&&
r.recommendLot === result.data.lot
&&r.scaned === scaned
return r.itemCode === result.data.itemCode &&
r.recommendPackingCode === result.data.code &&
r.recommendLot === result.data.lot &&
r.scaned === scaned
})
if(itemCode3==undefined){
if (itemCode3 == undefined) {
//
console.log("零件号相同、箱码相同、批次不同")
setTimeout(res => {
showConfirmMsg(itemCode1.recommendPackingCode+'未执行先进先出或不是最先批次,是否继续?', confirm => {
if (confirm) {
that.currentItem = itemCode1;
that.afterScanPackLabel(result);
} else {
that.scanPopupGetFocus();
}
});
}, 100)
}else {
that.currentItem = itemCode1;
that.afterScanPackLabel(result);
// setTimeout(res => {
// showConfirmMsg(itemCode1.recommendPackingCode+',?', confirm => {
// if (confirm) {
// that.currentItem = itemCode1;
// that.afterScanPackLabel(result);
// } else {
// that.scanPopupGetFocus();
// }
// });
// }, 100)
} else {
console.log("零件号相同、箱码相同、批次相同")
//
that.currentItem = itemCode3;
@ -377,159 +409,62 @@
}
}
// that.currentItem = that.details.find(r => {
// return r.itemCode === result.data.itemCode &&
// r.recommendPackingCode === result.data.code &&
// r.recommendLot === result.data.lot &&
// r.scaned === scaned
// });
// //
// if (that.currentItem === undefined) {
// var itemCode = that.details.find(res => {
// return res.itemCode === result.data.itemCode &&
// res.scaned === scaned
// })
// //
// if (itemCode != undefined) {
// var lot = that.details.find(res => {
// return res.itemCode === result.data.itemCode &&
// res.recommendLot === result.data.lot &&
// res.scaned === scaned
// })
// if (lot != undefined) {
// //
// that.currentItem = lot;
// that.afterScanPackLabel(result);
// } else {
// //
// //
// setTimeout(res => {
// showConfirmMsg(',?', confirm => {
// if (confirm) {
// that.currentItem = itemCode;
// that.afterScanPackLabel(result);
// } else {
// that.scanPopupGetFocus();
// }
// });
// }, 100)
// }
// } else {
// //
// var lot = that.details.find(res => {
// return res.recommendLot === result.data.lot &&
// res.scaned === scaned
// })
// //
// if (lot != undefined) {
// //
// that.showScanMessage('');
// } else {
// //,
// that.showScanMessage('');
// }
// }
// } else {
// that.afterScanPackLabel(result);
// }
},
afterScanPackLabel(result) {
let that = this;
that.getBalance(result, res => {
if (res.totalCount === 1) {
that.balancesItem = res.items[0];
if (that.balancesItem != null || that.balancesItem != undefined) {
that.setBalanceInfo(this.currentItem, that.balancesItem);
that.scanPopupGetFocus();
}
} else {
this.$refs['issueitems'].openPopup(res.items);
}
});
},
//
getBalance(result, callback) {
uni.showLoading({
title: '扫描中...',
mask: true
})
let params = {
pageSize: 1000,
pageIndex: 1,
packingCode: result.data.code,
itemCode: result.data.itemCode,
lot: result.data.lot,
inventoryStatus: 2, //2
locationTypes: [2, 3],
sortBy: 'PackingCode asc'
};
issueBalances(params)
.then(res => {
if (res.totalCount === 0) {
this.showScanMessage('按零件号【' + result.data.itemCode + '】箱码【' + result.data.code + '】批次【' +
result
.data.lot + '】在【原料库、半成品库】未查询到库存信息');
} else {
callback(res);
}
uni.hideLoading();
})
.catch(err => {
this.showScanMessage(err.message);
uni.hideLoading();
});
},
setBalanceInfo(item, balanceItem) {
setParams(item, result) {
item.scaned = true;
item.scanDate = new Date() //
item.fromLocationCode = balanceItem.locationCode;
item.fromLocationErpCode = balanceItem.locationErpCode;
item.toLocationCode = item.locationCode;
item.toLocationErpCode = item.locationErpCode;
item.fromLocationCode = "";
item.fromLocationErpCode = "";
item.toLocationCode = result.data.locationCode;
item.toLocationErpCode = result.data.locationErpCode;
//
item.handledContainerCode = balanceItem.containerCode;
item.handledPackingCode = balanceItem.packingCode;
item.handledBatch = balanceItem.batch;
item.handledLot = balanceItem.lot;
item.defaultHandleQty = balanceItem.qty;
item.handledQty = balanceItem.qty;
item.handledFromLocationCode = balanceItem.locationCode;
item.handledFromLocationArea = balanceItem.locationArea;
item.handledFromLocationGroup = balanceItem.locationErpCode;
item.handledFromLocationErpCode = balanceItem.locationGroup;
item.handledFromWarehouseCode = balanceItem.warehouseCode;
item.toLocationArea = balanceItem.locationArea;
item.toLocationGroup = balanceItem.locationGroup;
item.toLocationErpCode = balanceItem.locationErpCode;
item.handledContainerCode = result.data.containerCode;
item.handledPackingCode = result.data.packingCode;
item.handledBatch = result.data.batch;
item.handledLot = result.data.lot;
item.defaultHandleQty = result.data.qty;
item.handledQty = result.data.qty;
item.handledFromLocationCode = "";
item.handledFromLocationArea = "";
item.handledFromLocationGroup = "";
item.handledFromLocationErpCode = "";
item.handledFromWarehouseCode = "";
item.handledToLocationCode = item.recommendToLocationCode,
item.handledToLocationArea = item.recommendToLocationArea
item.handledToLocationGroup = item.recommendToLocationGroup
item.handledToLocationErpCode = item.recommendToLocationErpCode
item.handledToWarehouseCode = item.recommendToWarehouseCode
item.toLocationCode = item.recommendToLocationCode;
item.recommendLot = result.data.lot;
item.recommendPackingCode = result.data.packingCode;
item.toLocationArea = "";
item.toLocationGroup = "";
item.toLocationErpCode = "";
//
item.scanItemCode = this.currentScanLebel.data.itemCode;
item.scanPackingCode = this.currentScanLebel.data.code;
item.scanLot = this.currentScanLebel.data.lot;
item.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN;
item.uom = balanceItem.uom;
item.worker = localStorage.userName_CN == "" ? localStorage.userName : localStorage.userName_CN;
item.uom = result.data.uom;
this.details.sort(compareDesc('scanDate')); //
this.calcScanCount(); //
this.$forceUpdate();
},
selectedBalanceItem(balanceItem) {
this.setBalanceInfo(this.currentItem, balanceItem);
afterScanPackLabel(result) {
this.setParams(this.currentItem, result)
this.scanPopupGetFocus();
},
// //
receive(callback) {
let params = {
@ -548,12 +483,12 @@
submit() {
let that = this;
if (that.datacontent.details.length === 0) {
this.showMessage('该任务没有要上架的零件');
this.showMessage('该任务没有选择的零件');
return;
}
let checkItems = that.details.filter(r => r.scaned === true);
if (checkItems.length < that.details.length) {
showConfirmMsg('还有未扫描的零件,是否继续发料', confirm => {
showConfirmMsg('还有未扫描的零件,是否提交?', confirm => {
if (confirm) {
that.finsh();
}
@ -563,27 +498,6 @@
}
},
handleLocation() {
let that = this;
if (that.details[0].requestLocationCode != that.toLocation) {
showConfirmMsg('目标库位【' + that.toLocation + '】与需求库位不一致,是否要将以上零件发到目标库位?', confirm => {
if (confirm) {
that.handledPackingCode();
} else {
that.clearScanLocation();
}
});
} else {
showConfirmMsg('是否要将以上零件发到目标库位:【' + that.toLocation + "】", confirm => {
if (confirm) {
that.handledPackingCode();
} else {
that.clearScanLocation();
}
});
}
},
//
handledPackingCode() {
let that = this;
@ -596,7 +510,7 @@
items.forEach(r => {
packingCodes += r.recommendPackingCode + ','
})
showConfirmMsg('以下箱码对应的实际箱码为空,是否要继续料?【' + packingCodes + "】", confirm => {
showConfirmMsg('以下箱码对应的实际箱码为空,是否要继续退料?【' + packingCodes + "】", confirm => {
if (confirm) {
that.finsh();
} else {
@ -617,9 +531,11 @@
that.datacontent.completeUserId = localStorage.getItem('userId')
that.datacontent.completeUserName = localStorage.getItem('userName_CN')
that.datacontent.completeTime = getCurrDateTime();
that.datacontent.worker = localStorage.userName_CN ==""?localStorage.userName:localStorage.userName_CN;
that.datacontent.worker = localStorage.userName_CN == "" ? localStorage.userName : localStorage
.userName_CN;
that.datacontent.details = that.details;
let params = JSON.stringify(that.datacontent);
console.log("提交", params)
finshUnProduceReturnJob(that.id, params)
.then(res => {
uni.hideLoading();
@ -636,11 +552,12 @@
//
backJobList(delay) {
setTimeout(() => {
uni.navigateTo({
url: './issueNoFIFO'
})
}, 1000)
uni.navigateBack()
// setTimeout(() => {
// uni.navigateTo({
// url: './unProduceReturn'
// })
// }, 1000)
},
clear() {
@ -712,12 +629,12 @@
},
qtyChanged(value, item, index) {
if (value <= 0) {
this.showMessage('料数量不能小于或等于0')
this.showMessage('退料数量不能小于或等于0')
item.handledQty = item.defaultHandleQty
this.$refs['comNumberBox_' + index][0].setValue(item.handledQty);
} else if (value > item.defaultHandleQty) {
item.handledQty = item.defaultHandleQty
this.showMessage('料数量不能大于库存数量:' + item.handledQty)
this.showMessage('退料数量不能大于库存数量:' + item.handledQty)
this.$refs['comNumberBox_' + index][0].setValue(item.handledQty);
}
},

1
fe/PDA/static/menus/dy_menu/menu_pick.svg

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1703473129256" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8395" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M884.701867 710.371556h-552.96c-62.839467 0-113.777778-50.938311-113.777778-113.777778V253.246578a45.511111 45.511111 0 0 0-17.043911-35.498667l-101.376-81.271467a22.755556 22.755556 0 0 1 28.4672-35.498666l101.376 81.248711a91.022222 91.022222 0 0 1 34.087822 71.020089v343.3472a68.266667 68.266667 0 0 0 68.266667 68.266666h552.96a22.755556 22.755556 0 1 1 0 45.511112z" fill="#000000" p-id="8396"></path><path d="M731.044978 371.427556a22.755556 22.755556 0 0 1 23.847822 38.764088l-153.6 94.481067a22.755556 22.755556 0 0 1-23.847822 0l-153.6-94.481067a22.755556 22.755556 0 1 1 23.847822-38.764088l141.676089 87.153777 141.676089-87.153777zM413.013333 664.860444a88.177778 88.177778 0 1 1 0 176.355556 88.177778 88.177778 0 0 1 0-176.355556z m0 45.511112a42.666667 42.666667 0 1 0 0 85.333333 42.666667 42.666667 0 0 0 0-85.333333zM742.968889 664.860444a88.177778 88.177778 0 1 1 0 176.355556 88.177778 88.177778 0 0 1 0-176.355556z m0 45.511112a42.666667 42.666667 0 1 0 0 85.333333 42.666667 42.666667 0 0 0 0-85.333333z" fill="#000000" p-id="8397"></path><path d="M566.613333 466.488889V113.777778a22.755556 22.755556 0 1 1 45.511111 0v352.711111a22.755556 22.755556 0 1 1-45.511111 0zM765.724444 568.888889h-352.711111a22.755556 22.755556 0 1 1 0-45.511111h352.711111a22.755556 22.755556 0 1 1 0 45.511111z" fill="#000000" p-id="8398"></path></svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

1
fe/PDA/static/menus/dy_menu/menu_return.svg

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1703473202518" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9577" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512.33 459.1c-93.56 0-169.67 76.13-169.67 169.68a19.45 19.45 0 0 0 38.9 0A130.65 130.65 0 1 1 483 756.25l32-23.63a19.45 19.45 0 0 0-23.11-31.29l-63.65 47a19.45 19.45 0 0 0-1.22 30.31l63.65 55.44a19.45 19.45 0 1 0 25.55-29.32l-7.46-6.5c1.18 0 2.34 0.19 3.53 0.19 93.55 0 169.67-76.11 169.67-169.67S605.88 459.1 512.33 459.1z" fill="#2A2A37" p-id="9578"></path><path d="M916.52 345.42l-55-161.13A116.82 116.82 0 0 0 751 105.17H277.06a116.82 116.82 0 0 0-110.58 79.12l-55 161.12a116.58 116.58 0 0 0-6.27 37.74v422.72a117 117 0 0 0 116.88 116.84h583.84a117 117 0 0 0 116.85-116.84V383.15a116.55 116.55 0 0 0-6.26-37.73zM203.29 196.85a77.94 77.94 0 0 1 73.77-52.78H751a77.93 77.93 0 0 1 73.78 52.78l52.72 154.66h-727z m602.64 687H222.09a78 78 0 0 1-78-77.94v-415.5h739.79v415.46a78 78 0 0 1-77.95 77.94z" fill="#2A2A37" p-id="9579"></path></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

Loading…
Cancel
Save