wugg 2 anni fa
parent
commit
3e93e16eb9
1 ha cambiato i file con 30 aggiunte e 26 eliminazioni
  1. 30 26
      app/admin/controller/After.php

+ 30 - 26
app/admin/controller/After.php

@@ -1096,33 +1096,37 @@ class After extends Base
                                 Db::rollback();
                                 return error_show(1005,'销售单订单更新失败');
                             }
-                            $ordernum =Db::name("order_num")->where(['orderCode'=>$info['orderCode']])->find();
-                            if($ordernum==false){
-                                Db::rollback();
-                                return error_show(1005,'未找到关联采购单');
-                            }
-                            $ordernum['send_num']-=$info['error_num'];
-                            $orderup =Db::name("order_num")->save($ordernum);
-                            if($orderup==false){
-                                Db::rollback();
-                                return error_show(1005,'关联数据更新失败');
-                            }
-                            $cgd =Db::name("purchease_order")->where(["cgdNo"=>$ordernum['cgdNo'],"is_del"=>0])->find();
-                            if($cgd==false){
-                                Db::rollback();
-                                return error_show(1005,'未找到采购单数据');
-                            }
-                            $cgd['th_num']+=  $info['error_num'];
-                            if($cgd['th_num']==$cgd['send_num']&& $cgd['wsend_num']==0){
-                                $cgd['status']=4;
-                            }
-                            $cgd['th_fee']+=  round($info['error_num']*$cgd['good_price'],2);
-                            $cgd['updatetime']= date("Y-m-d H:i:s");
-                            $cgdup =Db::name("purchease_order")->save($cgd);
-                            if($cgdup==false){
-                                Db::rollback();
-                                return error_show(1005,'采购单数据更新失败');
+                            if($sale['is_stock']==0){
+                            	 $ordernum =Db::name("order_num")->where(['orderCode'=>$info['orderCode']])->find();
+	                            if($ordernum==false){
+	                                Db::rollback();
+	                                return error_show(1005,'未找到关联采购单');
+	                            }
+	                            $ordernum['send_num']-=$info['error_num'];
+	                            $orderup =Db::name("order_num")->save($ordernum);
+	                            if($orderup==false){
+	                                Db::rollback();
+	                                return error_show(1005,'关联数据更新失败');
+	                            }
+	                            $cgd =Db::name("purchease_order")->where(["cgdNo"=>$ordernum['cgdNo'],"is_del"=>0])->find();
+	                            if($cgd==false){
+	                                Db::rollback();
+	                                return error_show(1005,'未找到采购单数据');
+	                            }
+	                            $cgd['th_num']+=  $info['error_num'];
+	                            if($cgd['th_num']==$cgd['send_num']&& $cgd['wsend_num']==0){
+	                                $cgd['status']=4;
+	                            }
+	                            $cgd['th_fee']+=  round($info['error_num']*$cgd['good_price'],2);
+	                            $cgd['updatetime']= date("Y-m-d H:i:s");
+	                            $cgdup =Db::name("purchease_order")->save($cgd);
+	                            if($cgdup==false){
+	                                Db::rollback();
+	                                return error_show(1005,'采购单数据更新失败');
+	                            }
                             }
+
+
                             if($info['error_num']>=$out['send_num']){
                                     $out['status']=4;
                                     $out['updatetime']=date("Y-m-d H:i:s");