wufeng 2 年 前
コミット
4550a55768
2 ファイル変更3 行追加3 行削除
  1. 1 1
      app/abutment/controller/Order.php
  2. 2 2
      app/admin/controller/Sale.php

+ 1 - 1
app/abutment/controller/Order.php

@@ -607,7 +607,7 @@ class Order extends HomeBaseController
 
                             if ($upcgd == false) throw new Exception('采购单数量更新失败');
                         }
-                        if ($cgdinfo[$cgdNo]['send_status'] == 3 && $cgdinfo[$cgdNo]['order_type'] != 1) {
+                        if ($cgdinfo[$cgdNo]['send_status'] == 1 && $cgdinfo[$cgdNo]['order_type'] != 1) {
                             $send = Db::name("order_send")->where(["cgdNo" => $cgdNo, "status" => 1])->column("outCode");
                             if (!empty($send)) {
                                 $out = Db::name("order_out")->where(["outCode" => $send, "status" => 0])->select()->toArray();

+ 2 - 2
app/admin/controller/Sale.php

@@ -4592,13 +4592,13 @@ class Sale extends Base
                     return app_show(1005, '下列发货申请单号重复', [$value]);
                 } else $temp_out_codes[$value['outCode']] = $value['outCode'];
 
-                if ($sale_infos[$order_out_infos[$value['outCode']]]['is_stock'] == 1) {
+                if ($sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['is_stock'] == 1) {
                     if (!in_array($own_roleid, config('app.wsm_cgder_role'))) {
                         Db::rollback();
                         return app_show(1003, $value['outCode'] . '发货单只能由库管操作');
                     }
                 } else {
-                    if ($createrid! = $sale_infos[$order_out_infos[$value['outCode']]]['cgderid']) {
+                    if ($createrid! = $sale_infos[$order_out_infos[$value['outCode']]['orderCode']]['cgderid']) {
                         Db::rollback();
                         return app_show(1003, $value['outCode'] . '发货单只能由供应商负责人操作');
                     }