mirror of
https://gitee.com/ShopeX/OMS
synced 2026-04-06 14:55:37 +08:00
1. 【新增】售后单售后原因类型支持搜索
2. 【新增】手工创建订单折扣可输入正数 3. 【优化】盘点申请单确认 4. 【修复】采购退货单模拟出库失败问题 5. 【新增】订单金额客户实付与结算金额 6. 【优化】仓库发货统计报表物料名称显示 7. 【优化】自有仓储虚拟发货逻辑 8. 【修复】基础物料分类管理问题
This commit is contained in:
@@ -14,7 +14,6 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
/**
|
||||
* 商品明细controller
|
||||
*
|
||||
@@ -391,9 +390,9 @@ class inventorydepth_ctl_shop_frame extends desktop_controller {
|
||||
$products_pko = $salesMaterialObj->getList('sm_id,sales_material_name,sales_material_bn,shop_id', array('sales_material_bn'=>$shop_product_bn, 'sales_material_type'=>5));
|
||||
|
||||
$products = $products ? $products : array();
|
||||
kernel::single('inventorydepth_stock_pkg')->writeMemory($products_pkg);
|
||||
kernel::single('inventorydepth_stock_products')->writeMemory($products);
|
||||
kernel::single('inventorydepth_stock_pko')->writeMemory($products_pko);
|
||||
// kernel::single('inventorydepth_stock_pkg')->writeMemory($products_pkg);
|
||||
// kernel::single('inventorydepth_stock_products')->writeMemory($products);
|
||||
// kernel::single('inventorydepth_stock_pko')->writeMemory($products_pko);
|
||||
|
||||
$skuMapping = array();
|
||||
$list = $this->app->model('shop_adjustment')->getList('shop_product_bn,bind',array('shop_product_bn'=>$shop_product_bn,'mapping'=>'1','shop_id'=>$shop_id));
|
||||
@@ -458,7 +457,7 @@ EOF;
|
||||
}
|
||||
|
||||
$shop_product_bn = array(); $pkgFlag = $productFlag = $pkoFlag = array();
|
||||
if ($r['skus']['sku']) {
|
||||
if (isset($r['skus']['sku']) && $r['skus']['sku']) {
|
||||
foreach ($r['skus']['sku'] as $sku) {
|
||||
$shop_product_bn[] = $sku['outer_id'];
|
||||
if (isset($skuMapping[$sku['outer_id']]) && $skuMapping[$sku['outer_id']] == 1) {
|
||||
|
||||
Reference in New Issue
Block a user