shish 11 часов назад
Родитель
Сommit
c74020f546
1 измененных файлов с 8 добавлено и 4 удалено
  1. 8 4
      biz-ghs/order/classes/PurchaseOrderClass.php

+ 8 - 4
biz-ghs/order/classes/PurchaseOrderClass.php

@@ -968,6 +968,10 @@ class PurchaseOrderClass extends BaseClass
         }
     }
 
+    /**
+     * 确认入库:加库存、挂账、改状态为已完成。
+     * 入库时间以本次确认时刻为准(可被 $data['entryTime'] 显式覆盖),避免「稍后入库」仍沿用开单时间。
+     */
     public static function putIn($cg, $data)
     {
         if ($cg->status == self::PURCHASE_ORDER_STATUS_COMPLETE) {
@@ -1218,10 +1222,10 @@ class PurchaseOrderClass extends BaseClass
         self::initDebtPrices($cg, $currentPrice);
         $cg->status = $status;
         $update = ['status' => $status];
-        if (isset($data['entryTime']) && !empty($data['entryTime'])) {
-            $cg->entryTime = $data['entryTime'];
-            $update['entryTime'] = $data['entryTime'];
-        }
+        // 确认入库:默认写入当前时间;仅当调用方显式传入 entryTime 时才按传入值落库
+        $entryTime = (!empty($data['entryTime'])) ? $data['entryTime'] : date('Y-m-d H:i:s');
+        $cg->entryTime = $entryTime;
+        $update['entryTime'] = $entryTime;
         PurchaseOrderItemClass::updateByCondition(['orderSn' => $orderSn], $update);
         $cg->save();
         return $cg;