路上数量

biz-ghs/book/classes/BookItemClass.php

@@ -560,11 +560,11 @@ class BookItemClass extends BaseClass
         $staffId = $params['staffId'] ?? 0;
 
         $currentCapitalType = dict::getDict('capitalType', 'ghsPurchase');
-        $customId = 0;
-        $customName = '';
-        $customNamePy = '';
+        $customId = $params['customId'] ?? 0;
+        $customName = $params['customName'] ?? '';
+        $customNamePy = $params['customNamePy'] ?? '';
         $orderSn = $bill->orderSn ?? '';
-        $event = "{$staffName} 新增待入库 {$orderSn}，路上增加 {$name}" . $addRoadNum . $bigUnit;
+        $event = "{$staffName} 新增待入库 {$orderSn}({$customName})，路上增加 {$name}" . $addRoadNum . $bigUnit;
 
         $changeData = [
             'mainId' => $mainId,
@@ -692,11 +692,11 @@ class BookItemClass extends BaseClass
         $currentChangeType = $params['currentChangeType'] ?? 'delBook';
         if ($currentChangeType == 'addCg') {
             $currentCapitalType = dict::getDict('capitalType', 'ghsPurchase');
-            $customId = 0;
-            $customName = '';
-            $customNamePy = '';
+            $customId = $params['customId'] ?? 0;
+            $customName = $params['customName'] ?? '';
+            $customNamePy = $params['customNamePy'] ?? '';
             $orderSn = $bill->orderSn ?? '';
-            $event = $staffName . "增加待入库单 {$orderSn} 减少待采 {$name} " . $delNeedCgNum . $bigUnit;
+            $event = $staffName . "新增加待入库 {$orderSn}({$customName}) 减少待采 {$name} " . $delNeedCgNum . $bigUnit;
         } elseif ($currentChangeType == 'pdAddStock') {
             $currentCapitalType = dict::getDict('capitalType', 'pd');
             $event = $staffName . '盘点增加库存' . $delNeedCgNum . $bigUnit . '，减少待采' . $delNeedCgNum . $bigUnit;

biz-ghs/book/classes/BookItemCustomClass.php

@@ -430,7 +430,7 @@ class BookItemCustomClass extends BaseClass
         if ($currentChangeType == 'addCg') {
             $currentCapitalType = dict::getDict('capitalType', 'ghsPurchase');
             $orderSn = $bill->orderSn ?? '';
-            $event = $staffName . "增加待入库单 {$orderSn} 减少待采 {$name} " . $delNeedCgNum . $bigUnit;
+            $event = $staffName . "新增待入库 {$orderSn} 减少待采 {$name} " . $delNeedCgNum . $bigUnit;
         } elseif ($currentChangeType == 'pdAddStock') {
             $currentCapitalType = dict::getDict('capitalType', 'pd');
             $event = $staffName . '盘点增加库存' . $delNeedCgNum . $bigUnit . '，减少待采' . $delNeedCgNum . $bigUnit;

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -149,6 +149,9 @@ class PurchaseOrderClass extends BaseClass
 
                 //待采数量减少
                 $params['currentChangeType'] = 'addCg';
+                $params['customName'] = $bookItemCustomRes->customName ?? '';
+                $params['customId'] = $bookItemCustomRes->customId ?? '';
+                $params['customNamePy'] = $bookItemCustomRes->customNamePy ?? '';
                 $bookItemCustomRes = BookItemCustomClass::delNeedCgNum($bookItemCustomRes, $remainNeedSendNum, 0, $cg, $shop, $currentItemInfo, $params);
                 $bookCustomRes = BookCustomClass::delNeedCgNum($bookCustomRes, $remainNeedSendNum, 0, $cg, $shop, $currentItemInfo, $params);
                 $bookItemRes = BookItemClass::delNeedCgNum($bookItemRes, $remainNeedSendNum, 0, $cg, $shop, $currentItemInfo, $params);
@@ -230,7 +233,7 @@ class PurchaseOrderClass extends BaseClass
     }
 
     //取消采购入库 ssh 20231218
-    public static function cancel($cg,$shop,$params)
+    public static function cancel($cg, $shop, $params)
     {
         $cg->status = self::PURCHASE_ORDER_STATUS_CANCEL;
         $cg->save();
@@ -279,7 +282,7 @@ class PurchaseOrderClass extends BaseClass
                 $key = 'ghs_cg_order_scan_seat_' . $cg->id;
                 $noLock = util::lock($key);
                 if ($noLock) {
-                    CgOrderItemClass::cancelAssign($cg,$shop,$params);
+                    CgOrderItemClass::cancelAssign($cg, $shop, $params);
                     util::unlock($key);
                 } else {
                     util::fail('正在分配货位，请1秒后再取消');