From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Thu, 18 Apr 2024 15:00:26 +0000 (+0300)
Subject: правки по автозаказу
X-Git-Tag: 1.1~133^2
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=0dafd414ef8325b71529ad4836f814e27eccd8b8;p=erp24_rep%2Fyii-erp24%2F.git

правки по автозаказу
---

diff --git a/erp24/modul/shipment/ajaxDivisionAutoHandStart.php b/erp24/modul/shipment/ajaxDivisionAutoHandStart.php
index 54478a70..cce72796 100644
--- a/erp24/modul/shipment/ajaxDivisionAutoHandStart.php
+++ b/erp24/modul/shipment/ajaxDivisionAutoHandStart.php
@@ -1,13 +1,15 @@
-<?
-include_once("startup.php");
-include_once("inc/db.php");
-include_once("inc/base_new.php");
+<?php
+include_once(dirname(__DIR__, 2) . "/startup.php");
+include_once(dirname(__DIR__, 2) . "/inc/db.php");
+include_once(dirname(__DIR__, 2) . "/inc/base_new.php");
+
+global $orderId, $products, $productsColorsArray;
 
 if(!empty($_REQUEST["id"])) { 
-$orderId=(int)$_REQUEST["id"]; 
+$orderId=(int)$_REQUEST["id"];
 
 
-include"modul/shipment/functionsShipment.php";
+include_once(__DIR__. "/functionsShipment.php");
 $FiledsData=getDataFiledsData($orderId);
 $storeOrderArray=getRelationshipCityStore();
 
diff --git a/erp24/modul/shipment/fields/division_store.php b/erp24/modul/shipment/fields/division_store.php
index b7cfad35..2b363bac 100644
--- a/erp24/modul/shipment/fields/division_store.php
+++ b/erp24/modul/shipment/fields/division_store.php
@@ -1,4 +1,12 @@
-<?
+<?php
+global $orderId,
+       $orderStoresArrayRelation_in,
+       $orderStoresArrayRelation,
+       $products,
+       $productsColorsArray
+
+       ;
+
 $FiledsDataArray=[];
 
 
@@ -7,7 +15,7 @@ FROM store_orders_fields_data WHERE
 order_id=? 
 AND store_id=''
 AND field_name IN ('division_store_ratio','min_lot')
-AND value!=0 group by field_name, product_id ",[$orderId]);
+AND value!=0 group by field_name, product_id, store_id, value,color ",[$orderId]);
 foreach($dataF as $row) { 
   if(empty($row["color"])) $row["color"]=0;   
   $FiledsDataArray[$row["field_name"]][$row["product_id"]][0][$row["color"]]=$row["value"];
diff --git a/erp24/modul/shipment/functionsShipment.php b/erp24/modul/shipment/functionsShipment.php
index adbeef16..cf5063bd 100644
--- a/erp24/modul/shipment/functionsShipment.php
+++ b/erp24/modul/shipment/functionsShipment.php
@@ -22,8 +22,8 @@ $orderStoresArrayRelation, // массив с гуидами магазинов
 $orderStoresArrayRelation_in //  SQL условие для выборки по магазинам IN('store_id')
 , $productGroupArray // массив с ID подгруппы группы товаров для автозакупки Короткие розы
 ,$related_order_id
-,$date_start_division
-
+,$date_start_division,
+$param
 ;