ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-30 20:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

【优化】实收退导入界面

Browse Source 
【新增】快捷菜单功能入口

【新增】爱库存电子面单获取
This commit is contained in:
chenping
2026-04-21 22:36:45 +08:00
parent 8b4b4cc49f
commit b20d422532
45 changed files with 2367 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
app/wms/lib/event/trigger/logistics/data/electron/aikucun.php
View File

@@ -31,31 +31,69 @@ class wms_event_trigger_logistics_data_electron_aikucun extends wms_event_trigge
public function getDirectSdf($arrDelivery, $arrBill, $shop) {
$delivery = $arrDelivery[0];
if(empty($arrBill)) {
if (empty($arrBill)) {
$this->needRequestId[] = $delivery['delivery_id'];
} else {
$this->needRequestId[] = $arrBill[0]['b_id'];
$this->needRequestId[] = $arrBill[0]['b_id'];
$delivery['delivery_bn'] = $this->setChildRqOrdNo($delivery['delivery_bn'], $arrBill[0]['b_id']);
}
$dOrder = $this->getDeliveryOrder($this->needRequestId);
$order_bn = $dOrder[0]['order_bn'];
$shop_type = $dOrder[0]['shop_type'];
if($shop_type != 'aikucun'){
$deliveryItems = $this->getDeliveryItems($delivery['delivery_id']);
if (empty($shop)) {
$shop = [];
$branch = app::get('ome')->model('branch')->db_dump($delivery['branch_id']);
list(, $mainland) = explode(':', $branch['area']);
list($province, $city, $area) = explode('/', $mainland);
$shop['shop_name'] = $branch['name'];
$shop['province'] = $province;
$shop['city'] = $city;
$shop['area'] = $area;
$shop['street'] = '';
$shop['address_detail'] = $branch['address'];
$shop['default_sender'] = $branch['uname'];
$shop['mobile'] = $branch['mobile'];
$shop['tel'] = $branch['phone'];
$shop['zip'] = $branch['zip'];
}
$orders = app::get('ome')->model('orders')->getList('total_amount,shop_type,order_bn,custom_mark,mark_text,order_id', array('order_bn|in' => $delivery['order_bns']));
if (empty($orders) || $orders[0]['shop_type'] != 'aikucun') {
return false;
}
$primary_bn = uniqid('oet');
$orderIdArr = array_column($orders, 'order_id');
$orderExtend = app::get('ome')->model('order_extend')->getList('*', ['order_id|in' => $orderIdArr]);
$orderExtend = array_column($orderExtend, null, 'order_id');
$total_amount = 0;
foreach ($orders as $k => $order) {
$total_amount += $order['total_amount'];
$shop['shop_type'] = $order['shop_type'];
if ($orderExtend[$order['order_id']]) {
$orders[$k]['order_extend'] = [
'extend_field' => json_decode($orderExtend[$order['order_id']]['extend_field'], 1),
];
}
}
$dlyCorp = app::get('ome')->model('dly_corp')->dump(array('corp_id' => $delivery['logi_id']));
app::get('ome')->model('dly_corp_channel')->getChannel($dlyCorp, array($delivery));
$sdf = parent::getDirectSdf($arrDelivery, $arrBill, $shop);
$sdf['primary_bn'] = $delivery['delivery_bn'];
$sdf['delivery'] = $delivery;
$sdf['delivery_item'] = $deliveryItems;
$sdf['shop'] = $shop;
$sdf['dly_corp'] = $dlyCorp;
$sdf['total_amount'] = $total_amount;
$sdf['order'] = $orders;
$sdf = parent::getDirectSdf($arrDelivery, $arrBill, $shop);
$sdf['primary_bn'] = $primary_bn;
$sdf['order_bn'] = $order_bn;
$sdf['delivery'] = $delivery;
return $sdf;
}
}
}

4
app/wms/lib/event/trigger/logistics/data/electron/dewu.php
View File

@@ -35,8 +35,8 @@ class wms_event_trigger_logistics_data_electron_dewu extends wms_event_trigger_l
if (empty($arrBill)) {
$this->needRequestId[] = $delivery['delivery_id'];
} else {
$this->needRequestId[] = $arrBill[0]['log_id'];
$delivery['delivery_bn'] = $this->setChildRqOrdNo($delivery['delivery_bn'], $arrBill[0]['log_id']);
$this->needRequestId[] = $arrBill[0]['b_id'];
$delivery['delivery_bn'] = $this->setChildRqOrdNo($delivery['delivery_bn'], $arrBill[0]['b_id']);
}
$sdf = parent::getDirectSdf($arrDelivery, $arrBill, $shop);

4
app/wms/lib/event/trigger/logistics/data/electron/kuaishou.php
View File

@@ -69,8 +69,8 @@ class wms_event_trigger_logistics_data_electron_kuaishou extends wms_event_trigg
$deliveryExtend = array();
foreach($arrBill as $bill) {
$tmp = $dlyExtend;
$this->needRequestId[] = $bill['log_id'];
$tmp['delivery_bn'] = $this->setChildRqOrdNo($dlyExtend['delivery_bn'], $bill['log_id']);
$this->needRequestId[] = $bill['b_id'];
$tmp['delivery_bn'] = $this->setChildRqOrdNo($dlyExtend['delivery_bn'], $bill['b_id']);
$deliveryExtend[] = $tmp;
}
break;

4
app/wms/lib/event/trigger/logistics/data/electron/meituan4bulkpurchasing.php
View File

@@ -32,8 +32,8 @@ class wms_event_trigger_logistics_data_electron_meituan4bulkpurchasing extends w
if (empty($arrBill)) {
$this->needRequestId[] = $delivery['delivery_id'];
} else {
$this->needRequestId[] = $arrBill[0]['log_id'];
$delivery['delivery_bn'] = $this->setChildRqOrdNo($delivery['delivery_bn'], $arrBill[0]['log_id']);
$this->needRequestId[] = $arrBill[0]['b_id'];
$delivery['delivery_bn'] = $this->setChildRqOrdNo($delivery['delivery_bn'], $arrBill[0]['b_id']);
}
$deliveryItems = $this->getDeliveryItems($delivery['delivery_id']);

4
app/wms/lib/event/trigger/logistics/data/electron/wxshipin.php
View File

@@ -40,8 +40,8 @@ class wms_event_trigger_logistics_data_electron_wxshipin extends wms_event_trigg
if (empty($arrBill)) {
$this->needRequestId[] = $delivery['delivery_id'];
} else {
$this->needRequestId[] = $arrBill[0]['log_id'];
$delivery['delivery_bn'] = $this->setChildRqOrdNo($delivery['delivery_bn'], $arrBill[0]['log_id']);
$this->needRequestId[] = $arrBill[0]['b_id'];
$delivery['delivery_bn'] = $this->setChildRqOrdNo($delivery['delivery_bn'], $arrBill[0]['b_id']);
}
$deliveryItems = $this->getDeliveryItems($delivery['delivery_id']);

4
app/wms/lib/event/trigger/logistics/data/electron/xhs.php
View File

@@ -120,8 +120,8 @@ class wms_event_trigger_logistics_data_electron_xhs extends wms_event_trigger_lo
if (empty($arrBill)) {
$this->needRequestId[] = $delivery['delivery_id'];
} else {
$this->needRequestId[] = $arrBill[0]['log_id'];
$delivery['delivery_bn'] = $this->setChildRqOrdNo($delivery['delivery_bn'], $arrBill[0]['log_id']);
$this->needRequestId[] = $arrBill[0]['b_id'];
$delivery['delivery_bn'] = $this->setChildRqOrdNo($delivery['delivery_bn'], $arrBill[0]['b_id']);
}
$deliveryItems = $this->getDeliveryItems($delivery['delivery_id']);

4
app/wms/lib/event/trigger/logistics/data/electron/youzan.php
View File

@@ -75,8 +75,8 @@ class wms_event_trigger_logistics_data_electron_youzan extends wms_event_trigger
$deliveryExtend = array();
foreach($arrBill as $bill) {
$tmp = $dlyExtend;
$this->needRequestId[] = $bill['log_id'];
$tmp['delivery_bn'] = $this->setChildRqOrdNo($dlyExtend['delivery_bn'], $bill['log_id']);
$this->needRequestId[] = $bill['b_id'];
$tmp['delivery_bn'] = $this->setChildRqOrdNo($dlyExtend['delivery_bn'], $bill['b_id']);
$deliveryExtend[] = $tmp;
}
break;