ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-26 18:55:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

1. 【新增】售后单售后原因类型支持搜索

Browse Source 
2. 【新增】手工创建订单折扣可输入正数

3. 【优化】盘点申请单确认

4. 【修复】采购退货单模拟出库失败问题

5. 【新增】订单金额客户实付与结算金额

6. 【优化】仓库发货统计报表物料名称显示

7. 【优化】自有仓储虚拟发货逻辑

8. 【修复】基础物料分类管理问题
This commit is contained in:
chenping
2026-04-01 11:59:17 +08:00
parent 9341122827
commit 61783b7d01
754 changed files with 46179 additions and 5700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/inventorydepth/lib/logic/stock.php
View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* 更新库存逻辑
*
@@ -692,9 +691,10 @@ class inventorydepth_logic_stock extends inventorydepth_logic_abstract
// 获取销售物料对应的shop_sku_id
$smBnArr = array_column($products, 'sales_material_bn');
$_shopSkuList = $skusObj->getList('shop_product_bn,shop_sku_id', array('shop_id'=>$shop['shop_id'], 'shop_product_bn'=>$smBnArr, 'request'=>'true'));
$_shopSkuList = $skusObj->getList('shop_product_bn,shop_sku_id,shop_iid', array('shop_id'=>$shop['shop_id'], 'shop_product_bn'=>$smBnArr, 'request'=>'true'));
$shopSkuList = [];
foreach ($_shopSkuList as $_v) {
$_v['shop_sku_id'] = $_v['shop_sku_id'] ? $_v['shop_sku_id'] : $_v['shop_iid'];
$shopSkuList[$_v['shop_product_bn']][] = $_v['shop_sku_id'];
}
@@ -955,9 +955,9 @@ class inventorydepth_logic_stock extends inventorydepth_logic_abstract
}
// 如果配置了skuid，判断是否在skuid list里，不在则不回写
if (isset($shop_sku_id_list[$val['shop_product_bn']]) && array_filter($shop_sku_id_list[$val['shop_product_bn']]) && !in_array($val['shop_sku_id'], $shop_sku_id_list[$val['shop_product_bn']])) {
continue;
}
// if (isset($shop_sku_id_list[$val['shop_product_bn']]) && array_filter($shop_sku_id_list[$val['shop_product_bn']]) && !in_array($val['shop_sku_id'], $shop_sku_id_list[$val['shop_product_bn']])) {
// continue;
// }
$shop_product_bn = $val['shop_product_bn'];
//一个货号对应多个sku_id的场景
@@ -973,8 +973,13 @@ class inventorydepth_logic_stock extends inventorydepth_logic_abstract
if($skusList[$shop_product_bn]){
foreach ($skusList[$shop_product_bn] as $skuKey => $skuVal)
{
if ($val['sku_id'] && $skuVal['shop_sku_id'] != $val['sku_id'] && $skuVal['shop_iid'] != $val['sku_id']) {
continue;
}
$tmp = $val;
$tmp['sku_id'] = $skuVal['shop_sku_id'];
$tmp['sku_id'] = $val['sku_id'] == $skuVal['shop_iid'] ? '' : $skuVal['shop_sku_id'];
if (in_array($shop['node_type'], array('vop'))) {
$tmp['barcode'] = $skuVal['shop_sku_id'];
}