|
|
@@ -2142,7 +2142,7 @@ class WorkOrder extends Api
|
|
|
if (empty($param['workorder']) || empty($param['productCode']) || empty($param['option'])){
|
|
|
$this->error('参数错误');
|
|
|
}
|
|
|
- if (isset($param)){
|
|
|
+ if (isset($param['sort'])){
|
|
|
$priWhere['yj_yjno'] = ['>=',10];
|
|
|
$proWhere['Gy0_yjno'] = ['>=',10];
|
|
|
}else{
|
|
|
@@ -2237,7 +2237,7 @@ class WorkOrder extends Api
|
|
|
$ProcessList[$key]['Gy0_oil'] = $value['Gy0_Oil'];
|
|
|
$ProcessList[$key]['Gy0_计划接货数'] = 0;
|
|
|
$ProcessList[$key]['Gy0_计划损耗'] = 0;
|
|
|
- $ProcessList[$key]['无形损承担比例'] = 1;
|
|
|
+ $ProcessList[$key]['无形损承担比例'] = 0;
|
|
|
$ProcessList[$key]['超节损承担比例'] = 1;
|
|
|
$ProcessList[$key]['超节损核算单价'] = 0;
|
|
|
$ProcessList[$key]['Gy0_sj1'] = '1900-01-01 00:00:00';
|