|
|
@@ -264,7 +264,8 @@ class Filing extends Base
|
|
|
]);
|
|
|
|
|
|
if (!$val->check($param)) return json_show(1004, $val->getError());
|
|
|
-
|
|
|
+ $row= Db::name("filling")->findOrEmpty($param["id"]);
|
|
|
+ if(empty($row)) return json_show(1004, "未找到数据");
|
|
|
//如果是贵金属的话，额外判断
|
|
|
$cat = made($param['cat_id']);
|
|
|
if (isset($cat[0]['id']) && $cat[0]['id'] == 6) {
|
|
|
@@ -303,8 +304,7 @@ class Filing extends Base
|
|
|
$names = $userCommon->handle('getCodeAndName', ['code' => [$param['customerCode'], $param['supplierNo']]]);
|
|
|
if (!isset($names['data'][$param['customerCode']]) || $names['data'][$param['customerCode']] == '') return json_show(1004, '该业务公司不存在');
|
|
|
if (!isset($names['data'][$param['supplierNo']]) || $names['data'][$param['supplierNo']] == '') return json_show(1004, '该供应商不存在');
|
|
|
- $rs = Db::name('filing')
|
|
|
- ->save(array_merge($param, [
|
|
|
+ $data=array_merge($param,[
|
|
|
'customerName' => $names['data'][$param['customerCode']],
|
|
|
'supplierName' => $names['data'][$param['supplierNo']],
|
|
|
'service_proportion' => $param['expect_service_proportion'],//服务费比例与期望服务费比例一致
|
|
|
@@ -312,9 +312,9 @@ class Filing extends Base
|
|
|
'specinfo' => json_encode($param['spec_list']),
|
|
|
'wait_num'=>$param['num'],
|
|
|
'send_way' => 2,
|
|
|
- "staus"=>0,
|
|
|
- "is_check"=>0,
|
|
|
- "fill_url"=>$param["fill_url"],
|
|
|
+ 'staus'=>0,
|
|
|
+ 'is_check'=>0,
|
|
|
+ 'fill_url'=>$param['fill_url'],
|
|
|
'apply_id' => $this->uid,
|
|
|
'apply_name' => $this->uname,
|
|
|
'updaterid' => $this->uid,
|
|
|
@@ -327,7 +327,9 @@ class Filing extends Base
|
|
|
'good_img' => implode(',', $param['good_img']),
|
|
|
'origin_place' => implode(',', $param['origin_place']),
|
|
|
'delivery_place' => implode(',', $param['delivery_place']),
|
|
|
- ]));
|
|
|
+ ]);
|
|
|
+ $rs = Db::name('filing')
|
|
|
+ ->save(array_intersect_key($data,$row));
|
|
|
|
|
|
return $rs ? json_show(0, '报备单更新成功') : json_show(1004, '报备单更新失败');
|
|
|
|
