Revert "Merge remote-tracking branch 'origin/develop' into develop"
This reverts commit5946c1ea4b, reversing changes made to8d905c9844.
This commit is contained in:
@@ -1131,15 +1131,15 @@ function handleLocationClick(item, row, index) {
|
||||
.then((res) => {
|
||||
const list = res.data || [];
|
||||
const d = pickBestOrgQuantityRow(list);
|
||||
|
||||
// 严格批号查询有库存(orgQuantity > 0)
|
||||
if (d && Number(d.orgQuantity ?? 0) > 0) {
|
||||
const strictOk = d && Number(d.orgQuantity ?? 0) > 0;
|
||||
if (strictOk) {
|
||||
applyFromDto(d, false);
|
||||
if (Number(r.totalQuantity) <= 0) {
|
||||
proxy.$message.warning('仓库数量为0,无法调用!');
|
||||
}
|
||||
persistStore();
|
||||
return;
|
||||
}
|
||||
|
||||
// 严格查询无库存或数量为0 → 回退到非严格查询(查同仓库其他批号)
|
||||
if (lotTrimmed) {
|
||||
return runGet(false).then((res2) => {
|
||||
const list2 = res2.data || [];
|
||||
@@ -1157,8 +1157,6 @@ function handleLocationClick(item, row, index) {
|
||||
persistStore();
|
||||
});
|
||||
}
|
||||
|
||||
// 没有指定批号,直接提示
|
||||
r.totalQuantity = 0;
|
||||
r.price = 0;
|
||||
proxy.$message.warning('仓库数量为0,无法调用!');
|
||||
|
||||
Reference in New Issue
Block a user