mirror of
https://gitee.com/ShopeX/OMS
synced 2026-04-25 02:05:56 +08:00
1. 【新增】售后单售后原因类型支持搜索
2. 【新增】手工创建订单折扣可输入正数 3. 【优化】盘点申请单确认 4. 【修复】采购退货单模拟出库失败问题 5. 【新增】订单金额客户实付与结算金额 6. 【优化】仓库发货统计报表物料名称显示 7. 【优化】自有仓储虚拟发货逻辑 8. 【修复】基础物料分类管理问题
This commit is contained in:
@@ -17,8 +17,8 @@
|
||||
/**
|
||||
* 商品分配推送
|
||||
*
|
||||
* @category
|
||||
* @package
|
||||
* @category
|
||||
* @package
|
||||
* @author chenping<chenping@shopex.cn>
|
||||
* @version $Id: Z
|
||||
*/
|
||||
@@ -27,11 +27,10 @@ class erpapi_wms_request_goods extends erpapi_wms_request_abstract
|
||||
|
||||
/**
|
||||
* 商品添加
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
* @author
|
||||
* */
|
||||
|
||||
**/
|
||||
public function goods_add($sdf){
|
||||
$title = $this->__channelObj->wms['channel_name'] . '商品添加';
|
||||
|
||||
@@ -57,12 +56,6 @@ class erpapi_wms_request_goods extends erpapi_wms_request_abstract
|
||||
return $this->__caller->call(WMS_ITEM_ADD, $params, $callback, $title,10);
|
||||
}
|
||||
|
||||
/**
|
||||
* goods_callback
|
||||
* @param mixed $response response
|
||||
* @param mixed $callback_params 参数
|
||||
* @return mixed 返回值
|
||||
*/
|
||||
public function goods_callback($response, $callback_params)
|
||||
{
|
||||
$rsp = $response['rsp'];
|
||||
@@ -143,10 +136,10 @@ class erpapi_wms_request_goods extends erpapi_wms_request_abstract
|
||||
|
||||
/**
|
||||
* 商品编辑
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
* @author
|
||||
* */
|
||||
**/
|
||||
public function goods_update($sdf){
|
||||
$title = $this->__channelObj->wms['channel_name'] . '商品编辑';
|
||||
|
||||
@@ -223,27 +216,17 @@ class erpapi_wms_request_goods extends erpapi_wms_request_abstract
|
||||
return $params;
|
||||
}
|
||||
|
||||
/**
|
||||
* goods_addCombination
|
||||
* @param mixed $sdf sdf
|
||||
* @return mixed 返回值
|
||||
*/
|
||||
public function goods_addCombination($sdf) {
|
||||
return $this->error('没有该接口');
|
||||
}
|
||||
|
||||
/**
|
||||
* goods_syncMap
|
||||
* @param mixed $sdf sdf
|
||||
* @return mixed 返回值
|
||||
*/
|
||||
public function goods_syncMap($sdf) {
|
||||
return $this->error('没有该接口');
|
||||
}
|
||||
|
||||
/**
|
||||
* 同步库存
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
* @author
|
||||
*/
|
||||
@@ -287,9 +270,16 @@ class erpapi_wms_request_goods extends erpapi_wms_request_abstract
|
||||
$rs = $this->__caller->call(WMS_STOCK_QUERY, $params, [],$title,10,$sdf['wms_branch_bn']);
|
||||
if(isset($rs['data'])) {
|
||||
$data = @json_decode($rs['data'], 1);
|
||||
$rs['total_count'] = $data['succ'][0]['total_count'];
|
||||
$data = $data['succ'][0]['item_list'] ? : [];
|
||||
|
||||
// total_count
|
||||
$rs['total_count'] = isset($data['succ'][0]['total_count']) ? intval($data['succ'][0]['total_count']) : 0;
|
||||
$data = isset($data['succ'][0]['item_list']) ? $data['succ'][0]['item_list'] : [];
|
||||
$rs['data'] = [];
|
||||
|
||||
// check
|
||||
if(empty($data)){
|
||||
return $rs;
|
||||
}
|
||||
|
||||
foreach ($data as $v) {
|
||||
$rs['data'][] = [
|
||||
|
||||
Reference in New Issue
Block a user