|
@@ -488,8 +488,6 @@ class Purch extends Base
|
|
|
|
|
|
if (empty($rs)) throw new Exception('采购单不存在或不允许修改');
|
|
|
|
|
|
- if ($param['supplierNo'] == $rs['supplierNo'] && $param['wsm_code'] == $rs['wsm_code']) throw new Exception('没有修改的内容');
|
|
|
-
|
|
|
$update = ['updatetime' => date('Y-m-d H:i:s')];
|
|
|
|
|
|
//order_type==1备库
|
|
@@ -525,6 +523,15 @@ class Purch extends Base
|
|
|
$update['supplier_name'] = $supplier_rs['supplierName'];
|
|
|
}
|
|
|
|
|
|
+ //是否修改内容确定
|
|
|
+ if (isset($update['wsm_code'])) {
|
|
|
+ if ($update['wsm_code'] == $rs['wsm_code'] && $update['supplierNo'] == $rs['supplierNo']) throw new Exception('没有修改的内容,不能提交');
|
|
|
+ } elseif ($update['supplierNo'] == $rs['supplierNo']) throw new Exception('没有修改的内容,不能提交');
|
|
|
+
|
|
|
+
|
|
|
+ if ($update['supplierNo'] == $rs['supplierNo'] && $param['wsm_code'] == $rs['wsm_code']) throw new Exception('没有修改的内容');
|
|
|
+
|
|
|
+
|
|
|
//修改
|
|
|
Db::name('purchease_order')
|
|
|
->where([
|