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

9
app/inventorydepth/lib/shop.php
View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* @author chenping<chenping@shopex.cn>
*/
@@ -33,7 +32,7 @@ class inventorydepth_shop {
* @return void
* @author
**/
public function downloadList($shop_id,$filter,$page,&$errormsg)
public function downloadList($shop_id,$filter,$page,&$errormsg=null)
{
$shop = $this->app->model('shop')->db_dump($shop_id);
@@ -60,6 +59,7 @@ class inventorydepth_shop {
if($data === false) return false;
if($data){
$stores = [];
$itemModel = $this->app->model('shop_items');
$skuModel = $this->app->model('shop_skus');
$skuModel->batchInsert($data,$shop,$stores);
@@ -370,7 +370,7 @@ class inventorydepth_shop {
* @param unknown $page
* @param unknown $errormsg
*/
public function ajaxDownloadList($shop_id, $filter, $page)
public function ajaxDownloadList($shop_id, $filter, $page=0)
{
set_time_limit(0);
ini_set('memory_limit','1024M');
@@ -431,6 +431,7 @@ class inventorydepth_shop {
//保存数据
if($data){
$stores = [];
$itemModel = $this->app->model('shop_items');
$skuModel = $this->app->model('shop_skus');
$skuModel->batchInsert($data,$shop,$stores);
@@ -534,6 +535,8 @@ class inventorydepth_shop {
'num_iid' => $goods_key,
];
}
$stores = [];
$skuModel = app::get('inventorydepth')->model('shop_skus');
$itemModel = app::get('inventorydepth')->model('shop_items');
$skuModel->batchInsert($data,$shop,$stores);