ad

app/admin/controller/After.php

@@ -35,15 +35,18 @@ class After extends Base
             ->where("status","<",4)->sum("return_num");
         if($th_num!=0 || $after_num!=0){
             return error_show(1005,"存在售后或售后退货未结束流程");
-        }
-         $wsm =Db::name("warehouse_info")->where(["wsm_code"=>$orderout['wsm_code']])->find();
-        if($wsm==false){
-            return error_show(1005,"未找到仓库数据");
         }
         $oder= Db::name("sale")->where(["orderCode"=>$orderout['orderCode'],"is_del"=>0])->find();
         if(empty($oder)){
             return error_show(1005,"未找到订单数据");
         }
+		if($oder['order_type']!=1){
+			$wsm =Db::name("warehouse_info")->where(["wsm_code"=>$orderout['wsm_code']])->find();
+	        if($wsm==false){
+	            return error_show(1005,"未找到仓库数据");
+	        }
+		}
+
         if ($oder['order_type'] == 3) {
             $goon = Db::name("good_zixun")->where(["spuCode" => $oder['good_code'], "is_del" => 0])->find();
         } else {
@@ -104,8 +107,8 @@ class After extends Base
                 "customer_code"=>$oder['customer_code'],
                 "apply_id"=>$rm,
                 "apply_name"=>$ri,
-                "cgder"=>$wsm['contactor_name'],
-                "cgderid"=>$wsm['contactor'],
+                "cgder"=>$wsm['contactor_name'] ??'',
+                "cgderid"=>$wsm['contactor']??0,
                 "person"=>$supplier['person']??'',
                 "person_id"=>$supplier['personid']??0,
                 'total_num'=>$orderout['send_num'],

app/admin/model/SaleInfo.php

@@ -33,8 +33,8 @@ class SaleInfo extends Model
 				$stockup=["total_stock"=>$stock[$value['stockid']]['wait_out_stock']+$stock[$value['stockid']]['usable_stock'],"wait_out_stock"=>$stock[$value['stockid']]['wait_out_stock']-$sendNum,"updatetime"=>date("Y-m-d H:i:s")];
 				$sendNum=0;
 				}
-				self::update($temp,$value);
-				self::name("good_stock")->update($stockup,$stock[$value['stockid']]);
+				self::where($value)->update($temp);
+				self::name("good_stock")->where($stock[$value['stockid']])->update($stockup);
 			}
 			return true;
     }