ShuanghongS 3 semanas atrás
pai
commit
a247462d9f
2 arquivos alterados com 6 adições e 10 exclusões
  1. 5 4
      service/destination_delivery.class.php
  2. 1 6
      utils/common.class.php

+ 5 - 4
service/destination_delivery.class.php

@@ -910,10 +910,6 @@ class destination_delivery {
 
         if ($operate == "save"){
             $serial_no = common::deCode($_POST['serial_no'], 'D');
-            //DB2510210001-->DB+年+月+日+自增序號四位
-            //获取自然序列
-            $sequence = common::getDeliveryBookingSequence();  
-            $booking_no_new = "DB".date("ymd").$sequence;
             
             $booking_no = $_POST['booking_no'];  
             $manifest_type = $_POST['manifest_type'];  
@@ -1031,6 +1027,11 @@ class destination_delivery {
 
                 $saveData = $saveDataArr['result'];
                 foreach($saveData as $sData){
+                    //DB2510210001-->DB+年+月+日+自增序號四位
+                    //获取自然序列
+                    $sequence = common::getDeliveryBookingSequence();  
+                    $booking_no_new = $sequence;
+
                     $serial_no = common::uuid();
 
                     // 使用 PostgreSQL 的 ARRAY 语法

+ 1 - 6
utils/common.class.php

@@ -2898,12 +2898,7 @@ class common {
      * Delivery Booking No获取自然序列号
     */
     public static function getDeliveryBookingSequence(){
-        $sequence = common::excuteOneSql("select count(*) from public.kln_destination_delivery where created_time >= CURRENT_DATE");
-        $sequence = empty($sequence)? "1" : $sequence + 1;
-        if($sequence >9999){
-            return $sequence;
-        }
-        $sequence = sprintf("%04d", $sequence);
+        $sequence = common::excuteOneSql("select public.get_booking_no()");
         return $sequence;
     }