Browse Source

引用印件资料

qiuenguang 1 year ago
parent
commit
24d3a68003
1 changed files with 11 additions and 14 deletions
  1. 11 14
      application/api/controller/WorkOrder.php

+ 11 - 14
application/api/controller/WorkOrder.php

@@ -187,7 +187,6 @@ class WorkOrder extends Api
         //印件资料
         $printList = \db('工单_印件资料')
             ->where('Yj_Gdbh',$Gd_gdbh)
-            ->cache(true,84600)
             ->select();
         if (!empty($printList)){
             foreach ($printList as $key=>$value){
@@ -228,7 +227,6 @@ class WorkOrder extends Api
         //工艺资料
         $processList = \db('工单_工艺资料')
             ->where('Gy0_gdbh',$Gd_gdbh)
-            ->cache(true,84600)
             ->select();
         if (!empty($processList)){
             foreach ($processList as $key=>$value){
@@ -294,7 +292,6 @@ class WorkOrder extends Api
         $bomList = \db('工单_bom资料')
             ->where('BOM_工单编号',$Gd_gdbh)
             ->field($field)
-            ->cache(true,84600)
             ->select();
         if (!empty($bomList)){
             foreach ($bomList as $key=>$value){
@@ -512,32 +509,32 @@ class WorkOrder extends Api
             $lastId = $lastId + 1;
         }
         //获取原工单工艺资料
-        $oldProcessData = \db('工单_工艺资料')->where('Gy0_gdbh',$oldWorkOrder)->select();
+        $oldProcessData = \db('工单_工艺资料')->where('Gy0_gdbh',$newWorkOrder)->select();
         $ProsessUniqId = \db('工单_工艺资料')->field('UniqId')->order('UniqId desc')->find();
         foreach ($oldProcessData as $k=>$v){
-            $oldProcessData[$k]['Gy0_gdbh']  = $newWorkOrder;
+            $oldProcessData[$k]['Gy0_gdbh']  = $oldWorkOrder;
             $oldProcessData[$k]['Sys_id'] = '';
             $oldProcessData[$k]['UniqId'] = $lastId + $k;
         }
-        if (\db('工单_工艺资料')->where('Gy0_gdbh',$newWorkOrder)->find()){
-            \db('工单_工艺资料')->where('Gy0_gdbh',$newWorkOrder)->delete();
+        if (\db('工单_工艺资料')->where('Gy0_gdbh',$oldWorkOrder)->find()){
+            \db('工单_工艺资料')->where('Gy0_gdbh',$oldWorkOrder)->delete();
         }
         //获取原工单印件资料
-        $lastUniqId = \db('工单_工艺资料')->order('UniqId desc')->value('UniqId');
-        if ($lastUniqId<10000000){
-            $lastUniqId = 10000000;
+        $lastUniqId = \db('工单_印件资料')->order('UniqId desc')->value('UniqId');
+        if ($lastUniqId<1000000){
+            $lastUniqId = 1000000;
         }else{
             $lastUniqId = $lastUniqId + 1;
         }
-        $oldPrintData = \db('工单_印件资料')->where('Yj_Gdbh',$oldWorkOrder)->select();
+        $oldPrintData = \db('工单_印件资料')->where('Yj_Gdbh',$newWorkOrder)->select();
         $PrintUniqId = \db('工单_印件资料')->field('Uniqid')->order('Uniqid desc')->find();
         foreach ($oldPrintData as $k=>$v){
-            $oldPrintData[$k]['Yj_Gdbh']  = $newWorkOrder;
+            $oldPrintData[$k]['Yj_Gdbh']  = $oldWorkOrder;
             $oldPrintData[$k]['Sys_id'] = '';
             $oldPrintData[$k]['Uniqid'] = $lastUniqId +$k +1;
         }
-        if (\db('工单_印件资料')->where('Yj_Gdbh',$newWorkOrder)->find()){
-            \db('工单_印件资料')->where('Yj_Gdbh',$newWorkOrder)->delete();
+        if (\db('工单_印件资料')->where('Yj_Gdbh',$oldWorkOrder)->find()){
+            \db('工单_印件资料')->where('Yj_Gdbh',$oldWorkOrder)->delete();
         }
         //复制印件、工艺资料
         $ProcessSQL = \db('工单_工艺资料')->fetchSql(true)->insertAll($oldProcessData);