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

32
app/ome/lib/batch/log.php
View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class ome_batch_log{
function getStatus($status){
$status_array = array(
@@ -49,16 +48,14 @@ class ome_batch_log{
return $db->select($sql);
}
/**
* combineAgain
* @param mixed $arrOrderId ID
* @return mixed 返回值
*/
public function combineAgain($arrOrderId) {
$allNum = count($arrOrderId);
$orders = app::get('ome')->model('orders')->getList('order_id,order_combine_idx,order_combine_hash', array('order_id'=>$arrOrderId));
$orders = app::get('ome')->model('orders')->getList('order_id,process_status,order_combine_idx,order_combine_hash', array('order_id'=>$arrOrderId));
$hashOrder = array();
foreach ($orders as $key => $order) {
if(!in_array($order['process_status'], array('unconfirmed', 'confirmed', 'splitting'))){
continue;
}
// $hashOrder[$order['order_combine_hash']]['hash'] = $order['order_combine_hash'];
// $hashOrder[$order['order_combine_hash']]['idx'] = $order['order_combine_idx'];
// $hashOrder[$order['order_combine_hash']]['orders'][] = $order['order_id'];
@@ -82,16 +79,14 @@ class ome_batch_log{
$this->insertLogMq($params, array('all_num'=>$allNum, 'source'=>'combineagain'));
}
/**
* split
* @param mixed $arrOrderId ID
* @return mixed 返回值
*/
public function split($arrOrderId) {
$allNum = count($arrOrderId);
$orders = app::get('ome')->model('orders')->getList('order_id,order_combine_idx,order_combine_hash', array('order_id'=>$arrOrderId));
$orders = app::get('ome')->model('orders')->getList('order_id,process_status,order_combine_idx,order_combine_hash', array('order_id'=>$arrOrderId));
$hashOrder = array();
foreach ($orders as $key => $order) {
if(!in_array($order['process_status'], array('unconfirmed', 'confirmed', 'splitting'))){
continue;
}
// $hashOrder[$order['order_combine_hash']]['hash'] = $order['order_combine_hash'];
// $hashOrder[$order['order_combine_hash']]['idx'] = $order['order_combine_idx'];
// $hashOrder[$order['order_combine_hash']]['orders'][] = $order['order_id'];
@@ -115,13 +110,10 @@ class ome_batch_log{
$this->insertLogMq($params, array('all_num'=>$allNum, 'source'=>'split'));
}
/**
* insertLogMq
* @param mixed $params 参数
* @param mixed $data 数据
* @return mixed 返回值
*/
public function insertLogMq($params, $data) {
if(empty($params)){
return;
}
$allNum = $data['all_num'];
$taskType = $data['task_type'] ? $data['task_type'] : 'ordertaking';
$source = $data['source'] ? $data['source'] : 'direct';
@@ -166,4 +158,4 @@ class ome_batch_log{
}
}
}
}