ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-14 09:45:34 +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

18
app/console/lib/inventory/apply.php
View File

@@ -26,6 +26,12 @@ class console_inventory_apply {
public function confirm($apply_id, $diff_confirm = false) {
$objInAp = app::get('console')->model('inventory_apply');
$main = $objInAp->db_dump(['inventory_apply_id'=>$apply_id], '*');
if (empty($main)) {
return [false, ['msg'=>'盘点单不存在']];
}
if ($main['status'] == 'confirmed') {
return [true, ['msg'=>'已确认']];
}
if($main['negative_branch_id']) {
list($rs, $rsData) = $this->confirmZP($main);
if(!$rs) {
@@ -67,9 +73,9 @@ class console_inventory_apply {
$objInAp->update(['status'=>'confirming','process_date'=>time()], ['inventory_apply_id'=>$main['inventory_apply_id'], 'status'=>['unconfirmed','confirming']]);
$items = app::get('console')->model('inventory_apply_items')->getList('item_id,bm_id,material_bn,wms_stores,oms_stores,diff_stores,m_type,batch',['inventory_apply_id'=>$main['inventory_apply_id'], 'is_confirm'=>'0', 'm_type'=>'zp']);
if(empty($items)) {
kernel::database()->commit();
app::get('ome')->model('operation_log')->write_log('inventory_apply@console',$main['inventory_apply_id'],"良品确认成功");
return [true, ['msg'=>'良品确认完成']];
kernel::database()->rollBack();
app::get('ome')->model('operation_log')->write_log('inventory_apply@console',$main['inventory_apply_id'],"良品暂无待确认明细");
return [true, ['msg'=>'良品暂无待确认明细']];
}
$data = [
'task_id' => $main['inventory_apply_id'],
@@ -110,9 +116,9 @@ class console_inventory_apply {
$objInAp->update(['status'=>'confirming','process_date'=>time()], ['inventory_apply_id'=>$main['inventory_apply_id'], 'status'=>['unconfirmed','confirming']]);
$items = app::get('console')->model('inventory_apply_items')->getList('item_id,bm_id,material_bn,wms_stores,oms_stores,diff_stores,m_type,batch',['inventory_apply_id'=>$main['inventory_apply_id'], 'is_confirm'=>'0', 'm_type'=>'cc']);
if(empty($items)) {
kernel::database()->commit();
app::get('ome')->model('operation_log')->write_log('inventory_apply@console',$main['inventory_apply_id'],"残品确认成功");
return [true, ['msg'=>'良品确认完成']];
kernel::database()->rollBack();
app::get('ome')->model('operation_log')->write_log('inventory_apply@console',$main['inventory_apply_id'],"残品暂无待确认明细");
return [true, ['msg'=>'残品暂无待确认明细']];
}
$data = [
'task_id' => $main['inventory_apply_id'],