Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/ReorderChild.php

@@ -55,7 +55,7 @@ class ReorderChild extends Base
 
         }
         $val_child = Validate::rule([
-//            'outChildCode|发货工单号' => 'require',
+            'outChildCode|发货工单号' => 'max:255',
             'return_num|退货数量' => 'require|number|gt:0|max:999999999999',
             'return_wsm_code|退货仓库编码' => 'require'
         ]);
@@ -88,7 +88,7 @@ class ReorderChild extends Base
                     'returnCode' => $param['returnCode'],
                     'outCode' => $param['outCode'],
                     'outChildCode' => $value['outChildCode'] ?? '',
-                    'order_out_child_status' => $orderOutChild[$value['outChildCode']]['status'] ?? 0,
+                    'order_out_child_status' =>isset($value['outChildCode'])?($orderOutChild[$value['outChildCode']]['status'] ?? 0) :0,
                     'saleReturnChildCode' => substr(makeNo('KCC'), 0, -2) . str_pad($i++, 2, '0', STR_PAD_LEFT),
 //                    'type' => $param['type'],
                     'companyNo' => $saleReturn['companyNo'],
@@ -101,8 +101,8 @@ class ReorderChild extends Base
                     'addtime' => $date,
                     'updatetime' => $date,
                     'record' => '',
-                    'send_wsm_code' => $orderOutChild[$value['outChildCode']]['wsm_code'] ?? '',
-                    'send_num' => $orderOutChild[$value['outChildCode']]['num'] ?? 0,
+                    'send_wsm_code' =>  isset($value['outChildCode'])?($orderOutChild[$value['outChildCode']]['wsm_code'] ?? ''):"",
+                    'send_num' =>  isset($value['outChildCode'])?($orderOutChild[$value['outChildCode']]['num'] ?? 0):"",
                     'return_num' => $value['return_num'],
                     'return_wsm_code' => $value['return_wsm_code'],
                     'good_receive_type' => 0,
@@ -207,7 +207,7 @@ class ReorderChild extends Base
             'remark|备注' => 'max:255'
         ]);
 
-        if ($val->check($param)) return json_show(1004, $val->getError());
+        if ($val->check($param)==false) return json_show(1004, $val->getError());
 
         $info = Db::name('sale_return_child')
             ->alias('a')

app/admin/controller/Sale.php

@@ -21,9 +21,6 @@ use think\facade\Validate;
 class Sale extends Base
 {
 
-
-
-    
     public $noble = [];
 
     public function __construct(App $app)
@@ -4404,11 +4401,11 @@ class Sale extends Base
 
         $stock = 0;
         if ($ct['is_stock'] == 1) {
-            $good_stock = Db::name("good_stock")->alias("a")->leftJoin("warehouse_info b", "a.wsm_code=b.wsm_code")->where
-            (["spuCode" => $ct['spuCode'], "a.is_del" => 0, "a.status" => 1, "b.wsm_type" => 5])->field("a.id,a.usable_stock,a.wait_out_stock")->find();
+//            $good_stock = Db::name("good_stock")->alias("a")->leftJoin("warehouse_info b", "a.wsm_code=b.wsm_code")->where
+//            (["spuCode" => $ct['spuCode'], "a.is_del" => 0, "a.status" => 1, "b.wsm_type" => 5])->field("a.id,a.usable_stock,a.wait_out_stock")->find();
 
             //  $good_stock = Db::name("good_stock")->where(["spuCode" => $ct['spuCode'], "is_del" => 0])->find();
-            $stock = isset($good_stock['usable_stock']) ? $good_stock['usable_stock'] : "0";
+             $stock = Db::name("good")->where(["spuCode"=>$ct['spuCode']])->value("usable_stock",0);
         }
         if ($is_activity == 1) {
             $act = Db::name("activity_info")->alias("a")->leftJoin("good_activity b", "a.activity_code=b.activity_code")
@@ -4601,12 +4598,12 @@ class Sale extends Base
             ->where('is_del',0)
             ->where('spuCode',$order['spuCode'])
             ->findOrEmpty();
-        
+
         //补充商品创建人字段
         //  2022-9-7号确认 creater创建人即采购单的采购员 咨询cgder 只是供应商负责人
         $order['good_createrid']=$good_info['createrid']??$order['createrid'];
         $order['good_creater']=$good_info['creater']??$order['creater'];
-        
+
         return app_show(0, "获取成功", $order);
     }