|
@@ -975,17 +975,10 @@ class WorkOrderProcess extends Api
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$workOrder = Db::table('工单_基本资料')
|
|
$workOrder = Db::table('工单_基本资料')
|
|
|
- ->where('Uniqid', $params['id'])
|
|
|
|
|
|
|
+ ->where('Uniqid|订单编号', $params['id'])
|
|
|
->where('Mod_rq', null)
|
|
->where('Mod_rq', null)
|
|
|
->field('Uniqid,订单编号,计划制造工分')
|
|
->field('Uniqid,订单编号,计划制造工分')
|
|
|
->find();
|
|
->find();
|
|
|
- if (empty($workOrder)) {
|
|
|
|
|
- $workOrder = Db::table('工单_基本资料')
|
|
|
|
|
- ->where('订单编号', $params['id'])
|
|
|
|
|
- ->where('Mod_rq', null)
|
|
|
|
|
- ->field('Uniqid,订单编号,计划制造工分')
|
|
|
|
|
- ->find();
|
|
|
|
|
- }
|
|
|
|
|
if (empty($workOrder)) {
|
|
if (empty($workOrder)) {
|
|
|
$this->error('工单不存在');
|
|
$this->error('工单不存在');
|
|
|
}
|
|
}
|
|
@@ -996,6 +989,16 @@ class WorkOrderProcess extends Api
|
|
|
$this->error('计划制造工分未发生变化');
|
|
$this->error('计划制造工分未发生变化');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ $totalStandardScore = Db::table('工单_基础工艺资料')
|
|
|
|
|
+ ->where('work_order', $workOrder['订单编号'])
|
|
|
|
|
+ ->where('status', 0)
|
|
|
|
|
+ ->whereNull('del_rq')
|
|
|
|
|
+ ->sum('standard_score');
|
|
|
|
|
+ $totalStandardScore = $totalStandardScore ? floatval($totalStandardScore) : 0;
|
|
|
|
|
+ if ($totalStandardScore > floatval($newValue)) {
|
|
|
|
|
+ $this->error('工序定额分和大于制造工分,请修改确认之后再修改');
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$operTime = date('Y-m-d H:i:s');
|
|
$operTime = date('Y-m-d H:i:s');
|
|
|
$logData = [
|
|
$logData = [
|
|
|
'order_no' => $workOrder['订单编号'],
|
|
'order_no' => $workOrder['订单编号'],
|