Changeset 9cbd158

Timestamp:

Jun 24, 2011, 1:30:37 AM (12 years ago)

Author:

Blacklight <blacklight@…>

Branches:

master

Children:

ec0d8d6

Parents:

cf69520

Message:

• Исправление регресса: после перехода на новый способ контроля ГТД, при создании реализации на основе заявки, товары не копировались.

Location:

web/include

Files:

• doc.nulltype.php (modified) (2 diffs)
• doc.postuplenie.php (modified) (3 diffs)
• doc.zayavka.php (modified) (4 diffs)

web/include/doc.nulltype.php

@@ -80 +80 @@
         public function Create($doc_data, $from='')
         {
+                //var_dump($doc_data);
                 global $uid, $CONFIG;
                 if(!isAccess('doc_'.$this->doc_name,'create'))  throw new AccessException("");
@@ -89 +90 @@
                 $col_array=array();
                 for ($i = 0; $i < $columns; $i++)       $col_array[mysql_field_name($fields, $i)]=mysql_field_name($fields, $i);
-                unset($col_array['id'],$col_array['date'],$col_array['type'],$col_array['user']);
-                $col_array['altnum']=GetNextAltNum($this->doc_type ,$col_array['subtype']);
+                unset($col_array['id'],$col_array['date'],$col_array['type'],$col_array['user'],$col_array['ok']);
+                $doc_data['altnum']=GetNextAltNum($this->doc_type ,$col_array['subtype']);
                 $sqlinsert_keys="`date`, `type`, `user`";
                 $sqlinsert_value="'$date', '".$this->doc_type."', '$uid'";
-                
+//              echo"<br>";
+//              var_dump($col_array);
                 foreach($col_array as $key)
                 {

web/include/doc.postuplenie.php

@@ -369 +369 @@
                         VALUES ('$r_id','cena','{$this->dop_data['cena']}')");
 
-                        $res=mysql_query("SELECT `tovar`, `cnt`, `sn`, `comm`, `cost` FROM `doc_list_pos`
+                        $res=mysql_query("SELECT `tovar`, `cnt`, `comm`, `cost` FROM `doc_list_pos`
                         WHERE `doc_list_pos`.`doc`='{$this->doc}'");
                         while($nxt=mysql_fetch_row($res))
                         {
-                                mysql_query("INSERT INTO `doc_list_pos` (`doc`, `tovar`, `cnt`, `sn`, `comm`, `cost`)
-                                VALUES ('$r_id', '$nxt[0]', '$nxt[1]', '$nxt[2]', '$nxt[3]', '$nxt[4]' )");
+                                mysql_query("INSERT INTO `doc_list_pos` (`doc`, `tovar`, `cnt`, `comm`, `cost`)
+                                VALUES ('$r_id', '$nxt[0]', '$nxt[1]', '$nxt[2]', '$nxt[3]' )");
                         }
                 }
@@ -380 +380 @@
                 {
                         $new_id=0;
-                        $res=mysql_query("SELECT `a`.`tovar`, `a`.`cnt`, `a`.`sn`, `a`.`comm`, `a`.`cost`,
+                        $res=mysql_query("SELECT `a`.`tovar`, `a`.`cnt`, `a`.`comm`, `a`.`cost`,
                         ( SELECT SUM(`b`.`cnt`) FROM `doc_list_pos` AS `b`
                         INNER JOIN `doc_list` ON `b`.`doc`=`doc_list`.`id` AND `doc_list`.`p_doc`='{$this->doc}' AND `doc_list`.`mark_del`='0'
@@ -407 +407 @@
                                         }
                                         $n_cnt=$nxt[1]-$nxt[5];
-                                        mysql_query("INSERT INTO `doc_list_pos` (`doc`, `tovar`, `cnt`, `sn`, `comm`, `cost`)
-                                        VALUES ('$new_id', '$nxt[0]', '$n_cnt', '$nxt[2]', '$nxt[3]', '$nxt[4]' )");
+                                        mysql_query("INSERT INTO `doc_list_pos` (`doc`, `tovar`, `cnt`, `comm`, `cost`)
+                                        VALUES ('$new_id', '$nxt[0]', '$n_cnt', '$nxt[2]', '$nxt[3]' )");
                                 }
                         }

web/include/doc.zayavka.php

@@ -315 +315 @@
                         VALUES ('$r_id','cena','{$this->dop_data['cena']}')");
 
-                        $res=mysql_query("SELECT `tovar`, `cnt`, `sn`, `comm`, `cost` FROM `doc_list_pos`
+                        $res=mysql_query("SELECT `tovar`, `cnt`, `comm`, `cost` FROM `doc_list_pos`
                         WHERE `doc_list_pos`.`doc`='{$this->doc}'");
                         while($nxt=mysql_fetch_row($res))
                         {
-                                mysql_query("INSERT INTO `doc_list_pos` (`doc`, `tovar`, `cnt`, `sn`, `comm`, `cost`)
-                                VALUES ('$r_id', '$nxt[0]', '$nxt[1]', '$nxt[2]', '$nxt[3]', '$nxt[4]' )");
+                                mysql_query("INSERT INTO `doc_list_pos` (`doc`, `tovar`, `cnt`, `comm`, `cost`)
+                                VALUES ('$r_id', '$nxt[0]', '$nxt[1]', '$nxt[2]', '$nxt[3]')");
                         }
                 }
@@ -326 +326 @@
                 {
                         $new_id=0;
-                        $res=mysql_query("SELECT `a`.`tovar`, `a`.`cnt`, `a`.`sn`, `a`.`comm`, `a`.`cost`,
+                        $res=mysql_query("SELECT `a`.`tovar`, `a`.`cnt`, `a`.`comm`, `a`.`cost`,
                         ( SELECT SUM(`b`.`cnt`) FROM `doc_list_pos` AS `b`
                         INNER JOIN `doc_list` ON `b`.`doc`=`doc_list`.`id` AND `doc_list`.`p_doc`='{$this->doc}' AND `doc_list`.`mark_del`='0'
@@ -336 +336 @@
                         {
                                 //echo"$nxt[5] - $nxt[1]<br>";
-                                if($nxt[5]<$nxt[1])
+                                if($nxt[4]<$nxt[1])
                                 {
                                         
@@ -352 +352 @@
                                                 VALUES ('$new_id','cena','{$this->dop_data['cena']}')");
                                         }
-                                        $n_cnt=$nxt[1]-$nxt[5];
-                                        mysql_query("INSERT INTO `doc_list_pos` (`doc`, `tovar`, `cnt`, `sn`, `comm`, `cost`)
-                                        VALUES ('$new_id', '$nxt[0]', '$n_cnt', '$nxt[2]', '$nxt[3]', '$nxt[4]' )");
+                                        $n_cnt=$nxt[1]-$nxt[4];
+                                        mysql_query("INSERT INTO `doc_list_pos` (`doc`, `tovar`, `cnt`, `comm`, `cost`)
+                                        VALUES ('$new_id', '$nxt[0]', '$n_cnt', '$nxt[2]', '$nxt[3]' )");
                                 }
                         }