mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#445) from dev into main

Browse Source 
Reviewed-on: #445
This commit is contained in:
mkm 2025-01-08 15:27:31 +08:00
commit f0b299f1dc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/admin/logic/system_store_storage/SystemStoreStorageLogic.php
View File

@ -65,7 +65,7 @@ class SystemStoreStorageLogic extends BaseLogic
try { try {
$find=SystemStoreStorage::where(['id' => $params['id']])->find(); $find=SystemStoreStorage::where(['id' => $params['id']])->find();
if($find){ if($find){
if($find['order_type']==1){ // if($find['order_type']==1){
$find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'入库时间:'.date('Y-m-d H:i:s',time())]); $find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'入库时间:'.date('Y-m-d H:i:s',time())]);
$branch_product=StoreBranchProduct::where(['product_id'=>$find['product_id'],'store_id'=>$find['store_id']])->find(); $branch_product=StoreBranchProduct::where(['product_id'=>$find['product_id'],'store_id'=>$find['store_id']])->find();
if($branch_product){ if($branch_product){
@ -79,9 +79,9 @@ class SystemStoreStorageLogic extends BaseLogic
$storeBranchProduct->save(); $storeBranchProduct->save();
SqlChannelLog('StoreBranchProduct', $storeBranchProduct['id'], $find['nums'], 1,Request()->url(),$admin_id); SqlChannelLog('StoreBranchProduct', $storeBranchProduct['id'], $find['nums'], 1,Request()->url(),$admin_id);
} }
}else{ // }else{
$find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'确认时间:'.date('Y-m-d H:i:s',time())]); // $find->save(['status'=>1,'staff_id'=>$params['staff_id']??0,'admin_id'=>$params['admin_id']??0,'mark'=>'确认时间:'.date('Y-m-d H:i:s',time())]);
} // }
} }
Db::commit(); Db::commit();