shish 4 anni fa
parent
commit
058f75590e

+ 1 - 3
app-ghs/controllers/WastageController.php

@@ -52,10 +52,8 @@ class WastageController extends BaseController
                 } else {
                     $smallNum = $num;
                 }
-                $newProductList[] = ['id' => $id, 'bigNum' => $bigNum, 'smallNum' => $smallNum, 'classId' => 0, 'itemId' => 0];
+                $newProductList[] = ['productId' => $id, 'bigNum' => $bigNum, 'smallNum' => $smallNum, 'classId' => 0, 'itemId' => 0];
             }
-            //[{"productId":12233,"num":1,"unitType":0}]
-            //[{"id":"13051","bigNum":1,"smallNum":0,"classId":"1259","itemId":"3713"},{"id":"12677","bigNum":1,"smallNum":0,"classId":"1259","itemId":"1035"}]
             $productList = $newProductList;
         }
 

+ 25 - 0
console/controllers/InitController.php

@@ -20,6 +20,8 @@ use biz\stat\classes\StatOutMonthClass;
 use biz\stat\classes\StatSaleClass;
 use biz\stat\classes\StatSaleMonthClass;
 use bizGhs\item\classes\ItemClass;
+use bizGhs\order\classes\StockWastageOrderClass;
+use bizGhs\order\classes\StockWastageOrderItemClass;
 use bizGhs\stat\classes\StatYjClass;
 use bizGhs\stat\classes\StatYjMonthClass;
 use bizHd\goods\classes\GoodsCategoryClass;
@@ -98,10 +100,30 @@ class InitController extends Controller
             StatCgGhsClass::updateByCondition(['shopId' => $shopId], ['mainId' => $mainId]);
             StatCgGhsMonthClass::updateByCondition(['shopId' => $shopId], ['mainId' => $mainId]);
 
+
+
+
             /********琦海 start ************/
+
+            //报损中央化
+            StockWastageOrderClass::updateByCondition(['shopId' => $shopId], ['mainId' => $mainId]);
+            $wastageList = StockWastageOrderClass::getAllByCondition(['mainId' => $mainId], null, '*', null, true);
+            if (!empty($wastageList)) {
+                foreach ($wastageList as $wastage) {
+                    $wastageOrderSn = $wastage->orderSn ?? 0;
+                    StockWastageOrderItemClass::updateByCondition(['orderSn' => $wastageOrderSn], ['mainId' => $mainId]);
+                }
+            }
+
+
             //花材中央化
             ItemClass::updateByCondition(['shopId' => $shopId], ['mainId' => $mainId]);
+
+
             /********琦海 end ************/
+
+
+
         }
 
         //零售
@@ -129,8 +151,11 @@ class InitController extends Controller
 
 
             /********琦海 start ************/
+
             //花材中央化
             ItemClass::updateByCondition(['shopId' => $shopId], ['mainId' => $mainId]);
+
+
             /********琦海 end ************/
 
         }

+ 8 - 1
sql.txt

@@ -430,4 +430,11 @@ ALTER TABLE xhStatOrder ADD INDEX `mainId`(`mainId`,`time`);
 ALTER TABLE xhStatOrderCount DROP INDEX `shop`;
 ALTER TABLE xhStatOrderCount ADD INDEX `mainId`(`mainId`,`time`);
 ALTER TABLE xhStatOrderMonth DROP INDEX `shop`;
-ALTER TABLE xhStatOrderMonth ADD INDEX `mainId`(`mainId`,`time`);
+ALTER TABLE xhStatOrderMonth ADD INDEX `mainId`(`mainId`,`time`);
+
+====shish 20220319
+
+ALTER TABLE xhWastage ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `id`;
+ALTER TABLE xhWastageItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `id`;
+
+====报损中央化 shish 20220319