|
|
@@ -31,13 +31,13 @@ use app\admin\model\GoodZixun;use app\cxinv\model\CaixiaoData;use think\App;use
|
|
|
return error("采购单存在已对账数据",10005,$orderIsCheck);
|
|
|
}
|
|
|
if($purchOrder['order_source']!=2) return error("供应商非咨询单订单不可修改");
|
|
|
- $array_diff=array_diff($param['change'],$purchOrder);
|
|
|
+ $array_diff=array_diff($param['change'],$purchOrder->toArray());
|
|
|
if(array_key_exists("supplierNo",$array_diff)){
|
|
|
$persion = \app\user\model\Supplier::where("code",$array_diff['supplierNo'])->findOrEmpty();
|
|
|
$array_diff['cgder'] =$persion->person?:'';
|
|
|
$array_diff['cgder_id'] =$persion->personid?:'';
|
|
|
}
|
|
|
- $before= array_diff($purchOrder,$param['change']);
|
|
|
+ $before= array_diff($purchOrder->toArray(),$param['change']);
|
|
|
}
|
|
|
if($param['type']==2){
|
|
|
$saleOrder = \app\admin\model\Sale::where("orderCode",$param['code'])->findOrEmpty();
|
|
|
@@ -46,14 +46,14 @@ use app\admin\model\GoodZixun;use app\cxinv\model\CaixiaoData;use think\App;use
|
|
|
if(!empty($orderIsCheck)){
|
|
|
return error("销售单存在已对账数据",10005,$orderIsCheck);
|
|
|
}
|
|
|
- $array_diff=array_diff($param['change'],$saleOrder);
|
|
|
- $before= array_diff($saleOrder,$param['change']);
|
|
|
+ $array_diff=array_diff($param['change'],$saleOrder->toArray());
|
|
|
+ $before= array_diff($saleOrder->toArray(),$param['change']);
|
|
|
}
|
|
|
if($param['type']==3){
|
|
|
$good = GoodZixun::where("spuCode",$param['code'])->findOrEmpty();
|
|
|
if($good->isEmpty()) return error("咨询商品不存在");
|
|
|
- $array_diff=array_diff($param['change'],$good);
|
|
|
- $before= array_diff($good,$param['change']);
|
|
|
+ $array_diff=array_diff($param['change'],$good->toArray());
|
|
|
+ $before= array_diff($good->toArray(),$param['change']);
|
|
|
}
|
|
|
$isT= $this->model->where(["code"=>$param['code'],"status"=>1])->findOrEmpty();
|
|
|
if($isT->isEmpty()==false)return error("订单修改存在未完成得流程");
|
