ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-05-02 05:05:40 +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/erpapi/lib/shop/matrix/pinduoduo/request/delivery.php
View File

@@ -36,14 +36,15 @@ class erpapi_shop_matrix_pinduoduo_request_delivery extends erpapi_shop_request_
//@todo：1为首次发货：用于订单首次发货,仅待发货订单可传入;
//@todo：2为修改发货：用于订单修改发货,调用成功后将会覆盖原发货信息,仅已发货订单可传入(OMS现在没有此业务);
$param['redelivery_type'] = 1;
if($sdf['gift_order_flag']){
$param['package_type'] = 'break';
}
if ($sdf['delivery_package'] &&
(($sdf['is_split'] && !$sdf['is_first_delivery']) || !$sdf['is_split'])
) {
$logistics_list = [];
$firstDeliveryId = $sdf['first_delivery_id'];//第一张发货单ID
foreach ($sdf['delivery_package'] as $package) {
//排除第一张发货单
if ($package['delivery_id'] == $firstDeliveryId) {
@@ -67,11 +68,12 @@ class erpapi_shop_matrix_pinduoduo_request_delivery extends erpapi_shop_request_
if($sdf['gift_items'] && $sdf['gift_order_status']==1){
foreach($sdf['gift_items'] as $gv){
$gift_items = [
'tid'=>$gv['oid'],
'tid'=>$gv['order_bn'],
];
$logistics_list[$gv['oid']]['logistics_no'] = $package['logi_no'];
$logistics_list[$gv['oid']]['company_code'] = $package['logi_bn'];
$logistics_list[$gv['oid']]['tid'] = $gv['oid'];
$logistics_list[$gv['logi_no']]['logistics_no'] = $gv['logi_no'];
$logistics_list[$gv['logi_no']]['company_code'] = $gv['logi_bn'];
$logistics_list[$gv['logi_no']]['tid'] = $gv['order_bn'];
}
}
@@ -82,10 +84,20 @@ class erpapi_shop_matrix_pinduoduo_request_delivery extends erpapi_shop_request_
$tmparm = $param;
$param['packages_list'][0] = $param;
$giftparams =[];
foreach($sdf['gift_items'] as $gv){
$tmparm['tid'] = $gift_items['tid'];
$param['packages_list'][1] =$tmparm;
$giftparams = [
'tid'=>$gv['order_bn'],
'logistics_no'=>$gv['logi_no'],
'company_code'=>$gv['logi_type'],
'company_name'=>$gv['logi_name'],
'redelivery_type'=>1,
];
}
$param['packages_list'][1] =$giftparams;
$param['is_single_item_send'] = true;
}