ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-10 00:15:32 +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

11
app/inventorydepth/controller/shop/adjustment.php
View File

@@ -302,7 +302,7 @@ class inventorydepth_ctl_shop_adjustment extends desktop_controller {
$_POST['id'] = $id;
# 发布库存超出可售库存提示
$sku = $this->app->model('shop_adjustment')->select()->columns('shop_product_bn,shop_id,shop_bn,release_stock')
$sku = $this->app->model('shop_adjustment')->select()->columns('shop_product_bn,shop_id,shop_bn,release_stock,shop_sku_id,shop_iid')
->where('id=?',$id)->instance()->fetch_row();
$delivery_mode = app::get('ome')->model('shop')->db_dump(['shop_id'=>$sku['shop_id']], 'delivery_mode')['delivery_mode'];
@@ -373,6 +373,7 @@ class inventorydepth_ctl_shop_adjustment extends desktop_controller {
'sku_id' => $sku['shop_sku_id'],
'num_iid' => $sku['shop_iid'],
'barcode' => $sku['shop_sku_id'],
'shop_sku_id' => $sku['shop_sku_id'] ? $sku['shop_sku_id'] : $sku['shop_iid'],
);
// 查询增量库存
@@ -676,7 +677,7 @@ EOF;
}
$adjustmentModel = $this->app->model('shop_adjustment');
$skus = $adjustmentModel->getList('shop_product_bn,bind,shop_id,shop_bn,id,mapping',array('id'=>$ids));
$skus = $adjustmentModel->getList('shop_product_bn,bind,shop_id,shop_bn,id,mapping,shop_sku_id,shop_iid',array('id'=>$ids));
$pbns = [];
foreach ($skus as $sku) {
$pbns[] = $sku['shop_product_bn'];
@@ -702,8 +703,12 @@ EOF;
$data = array();
foreach ($skus as $sku) {
$product = $products[$sku['shop_product_bn']];
$product['shop_sku_id'] = $sku['shop_sku_id'] ? $sku['shop_sku_id'] : $sku['shop_iid'];
// 发布库存
$stock = kernel::single('inventorydepth_logic_stock')->getStock($products[$sku['shop_product_bn']],$sku['shop_id'],$sku['shop_bn']);
$stock = kernel::single('inventorydepth_logic_stock')->getStock($product,$sku['shop_id'],$sku['shop_bn']);
$quantity = $stock['quantity'];
$actual_stock = $stock['actual_stock'];