|
|
@@ -360,9 +360,9 @@ const queryOwnerTask= ()=>{
|
|
|
const _createPickingTask=(uidMap)=>{
|
|
|
const params = {
|
|
|
warehouse,
|
|
|
- type:'*',
|
|
|
+ orderType:'*',
|
|
|
uidMap,
|
|
|
- enableFlag:false
|
|
|
+ enableMixingProhibition:false
|
|
|
}
|
|
|
showLoading()
|
|
|
createPickingTask(params).then(res => {
|
|
|
@@ -505,32 +505,28 @@ const countRefFocus=()=>{
|
|
|
}
|
|
|
const createPicking = () => {
|
|
|
const splitStringIfExists = value => (typeof value === 'string' && value.trim() !== '') ? value.split(',') : undefined;
|
|
|
- let carriers = [];
|
|
|
let orderNoList = [];
|
|
|
let counts: number = count.value;
|
|
|
-
|
|
|
+ let uidMap = {}
|
|
|
if (['S', 'U', 'M'].includes(model.value.type)) {
|
|
|
orderNoList = checkedResult.value.map(item => item.orderNo);
|
|
|
- carriers = [...new Set(checkedResult.value.map(item => item.carrier))];
|
|
|
counts = orderNoList.length
|
|
|
}else if(model.value.type=='*'){
|
|
|
- orderNoList=subModel.value.orderNoList
|
|
|
- carriers = [...new Set(checkedResult.value.map(item => item.carrier))];
|
|
|
- } else {
|
|
|
- orderNoList=model.value.matchedOrderNoList
|
|
|
- carriers = subModel.value.carrierf
|
|
|
- ? splitStringIfExists(subModel.value.carrier)
|
|
|
- : splitStringIfExists(model.value.carrier);
|
|
|
+ uidMap={[subModel.value.uid]:counts}
|
|
|
}
|
|
|
const params = {
|
|
|
warehouse,
|
|
|
- owners: splitStringIfExists(model.value.owner),
|
|
|
- carriers,
|
|
|
- type: model.value.type,
|
|
|
- uid: subModel.value.uid || undefined,
|
|
|
- orderNoList,
|
|
|
- count: counts,
|
|
|
- // uidMap:Object.keys(uidMap).length !== 0?uidMap:undefined,
|
|
|
+ customerCode: splitStringIfExists(model.value.owner)[0],
|
|
|
+ carrierCodes:splitStringIfExists(model.value.carrier),
|
|
|
+ warehouseAttribute:splitStringIfExists(model.value.warehouseAttribute),
|
|
|
+ issuePartyNames:splitStringIfExists(model.value.issuePartyNames),
|
|
|
+ skus:splitStringIfExists(model.value.skus),
|
|
|
+ orderType: model.value.type,
|
|
|
+ uidMap: Object.keys(uidMap).length > 0 ? uidMap : undefined,
|
|
|
+ quantity: counts,
|
|
|
+ remark:model.value.remark,
|
|
|
+ orderNos:orderNoList.length>0?orderNoList:undefined,
|
|
|
+ provinces:splitStringIfExists(model.value.provinces),
|
|
|
}
|
|
|
showLoading()
|
|
|
createPickingTask(params).then(res => {
|