zck 1 week ago
parent
commit
2c4e55b827
1 changed files with 5 additions and 3 deletions
  1. 5 3
      application/api/controller/WorkOrderProcess.php

+ 5 - 3
application/api/controller/WorkOrderProcess.php

@@ -60,7 +60,7 @@ class WorkOrderProcess extends Api
             ->where('del_rq', null)
             ->where('del_rq', null)
             ->field('part_code as 部件编号,part_name as 部件名称,remark as 部件备注,part_type as 部件类型,status as 状态,
             ->field('part_code as 部件编号,part_name as 部件名称,remark as 部件备注,part_type as 部件类型,status as 状态,
             sys_id as 操作人,sys_rq as 操作时间,mod_rq as 修改时间,mod_id as 修改人,id as 部件ID')
             sys_id as 操作人,sys_rq as 操作时间,mod_rq as 修改时间,mod_id as 修改人,id as 部件ID')
-            ->order('part_code')
+            ->orderRaw('CAST(part_code AS UNSIGNED)')
             ->select();
             ->select();
         if(empty($list)){
         if(empty($list)){
             // $this->error('该工单没有部件,请先添加部件');
             // $this->error('该工单没有部件,请先添加部件');
@@ -271,8 +271,9 @@ class WorkOrderProcess extends Api
                 a.sys_id as 系统人,
                 a.sys_id as 系统人,
                 a.sys_rq as 系统时间,
                 a.sys_rq as 系统时间,
                 a.mod_id as 修改人,
                 a.mod_id as 修改人,
-                a.mod_rq as 修改时间')
-            ->order('a.id')
+                a.mod_rq as 修改时间,
+                a.status as 状态')
+            ->orderRaw('CAST(a.process_code AS UNSIGNED)')
             ->select();
             ->select();
 
 
         $this->success('成功', $list);
         $this->success('成功', $list);
@@ -1017,6 +1018,7 @@ class WorkOrderProcess extends Api
             ->field('id,part_code as 部件编号,part_name as 部件名称,process_code as 工序编号,process_name as 工序名称,
             ->field('id,part_code as 部件编号,part_name as 部件名称,process_code as 工序编号,process_name as 工序名称,
             big_process as 大工序,standard_hour as 秒,standard_minutes as 分,standard_score as 定额分,money as 金额,
             big_process as 大工序,standard_hour as 秒,standard_minutes as 分,standard_score as 定额分,money as 金额,
             coefficient as 难度系数,remark as 备注,status as 状态,pid')
             coefficient as 难度系数,remark as 备注,status as 状态,pid')
+            ->orderRaw('CAST(process_code AS UNSIGNED)')
             ->select();
             ->select();
         if (empty($workOrderProcess)) {
         if (empty($workOrderProcess)) {
             $this->error('工单工艺不存在');
             $this->error('工单工艺不存在');