小单位问题

app-ghs/controllers/StockOutController.php

@@ -48,8 +48,8 @@ class StockOutController extends BaseController
                 foreach ($changeFormatData as $k => $v) {
                     $productId = $v['productId'];
                     $actPutNum = $v['actPutNum'] ?? 0;
-                    $itemName = $v['itemName']??'';
-                    $changeData[$productId] = ['actPutNum' => $actPutNum,'itemName' => $itemName];
+                    $itemName = $v['itemName'] ?? '';
+                    $changeData[$productId] = ['actPutNum' => $actPutNum, 'itemName' => $itemName];
                 }
             }
         }
@@ -67,8 +67,8 @@ class StockOutController extends BaseController
                     $changeResult = $changeData[$productId];
                     $itemNum = $changeResult['actPutNum'];
                     $itemName = $changeResult['itemName'];
-                    if(!is_numeric($itemNum)) {
-                        util::fail('请填写【'.$itemName.'】回调数值');
+                    if (!is_numeric($itemNum)) {
+                        util::fail('请填写【' . $itemName . '】回调数值');
                     }
                 }
             }
@@ -280,10 +280,7 @@ class StockOutController extends BaseController
                 $bigNum = $v['bigNum'] ?? 0;
                 $smallNum = $v['smallNum'] ?? 0;
                 $name = $v['name'] ?? '';
-                if ($smallNum > 0) {
-                    util::fail($name . '不能调拨小单位');
-                }
-                if ($bigNum <= 0) {
+                if ($bigNum <= 0 && $smallNum <= 0) {
                     util::fail('花材数量不能为0');
                 }
             }

app-ghs/controllers/WastageController.php

@@ -59,12 +59,9 @@ class WastageController extends BaseController
         foreach ($productList as $v) {
             $bigNum = $v['bigNum'] ?? 0;
             $smallNum = $v['smallNum'] ?? 0;
-            if ($bigNum <= 0) {
+            if ($bigNum <= 0 && $smallNum <= 0) {
                 util::fail('花材数量不能为0');
             }
-            if($smallNum > 0){
-                util::fail('小单位不能报损');
-            }
         }
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
@@ -72,7 +69,7 @@ class WastageController extends BaseController
             //判断花材有效性
             ProductClass::valid($productList, $this->mainId);
             $post['product'] = $productList;
-            $return = StockWastageOrderClass::addOrder($post,$this->shop,true);
+            $return = StockWastageOrderClass::addOrder($post, $this->shop, true);
             $transaction->commit();
             util::success($return);
         } catch (\Exception $e) {