Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Sale.php

@@ -3699,15 +3699,25 @@ class Sale extends Base
 
             if (empty($rs)) throw new Exception('该出库单不存在或不允许确认收货');
 
+            //发货单收货
             $res_order_out = Db::name('order_out')
                 ->where(['id' => $rs['id'], 'status' => 2])
                 ->update(['status' => 3, 'updatetime' => date('Y-m-d H:i:s')]);
 
-            $res_sale = Db::name('sale')
-                ->where(['orderCode' => $rs['orderCode'], 'status' => 0])
-                ->update(['status' => 2, 'updatetime' => date('Y-m-d H:i:s')]);
+            //查询该发货单所属的销售单，是否还有未收货的其他发货单
+            $other_res_sale = Db::name('order_out')
+                ->where(['orderCode' => $rs['orderCode'], 'status' => 2])
+                ->where('id', '<>', $rs['id'])
+                ->find();
+
+            if (empty($other_res_sale)) {
+                //所属销售单也确认收货
+                Db::name('sale')
+                    ->where(['orderCode' => $rs['orderCode'], 'status' => 0])
+                    ->update(['status' => 2, 'updatetime' => date('Y-m-d H:i:s')]);
+            }
 
-            if ($res_order_out && $res_sale) {
+            if ($res_order_out) {
                 Db::commit();
                 return app_show(0, '收货完成');
             } else {