波次取消功能回滚

app/Http/Controllers/WaveController.php

@@ -77,6 +77,7 @@ class WaveController extends Controller
         $waveService = app("WaveService");
         $meg = ['success'=>false];
         $ids = $request->input("ids");
+        /** @var WaveService $waveService */
         $meg = $waveService->cancelPrint($ids);
         if($meg['fail_info']){
             return $meg;

app/Services/WaveService.php

@@ -49,10 +49,9 @@ class WaveService
         $sql .= " left join BAS_CODES codes on wave_header.WaveStatus = codes.CODE and codes.codeId = 'SO_STS'";
         return $sql;
     }
-
-    // cancel Print
     public function cancelPrint($ids)
     {
+        DB::enableQueryLog();
         $meg = ['success' => false, 'fail_info' => null];
         if (!$ids) {
             $meg['fail_info'] = '没有选中需要重置打印标记的波次!';
@@ -61,12 +60,7 @@ class WaveService
         if (is_string($ids)) {
             $ids = [$ids];
         }
-        $count = $this->verfifyIds($ids);
-        if(!$count) {
-            $meg['fail_info'] = "取消打印的波次中有不符合条件的波次";
-            return $meg;
-        }
-        $cancelPrint = OracleDOCWaveHeader::whereIn("WAVENO", $ids)->update(['udfprintflag2' => 'N','UserDefine2'=>'']);
+        $cancelPrint = OracleDOCWaveHeader::whereIn("WAVENO", $ids)->update(['udfprintflag2' => 'N', 'UserDefine2' => '']);
         if (!$cancelPrint) {
             $meg['fail_info'] = '没有选中需要重置打印标记的波次!';
             return $meg;
@@ -74,6 +68,30 @@ class WaveService
         $meg['success'] = true;
         return $meg;
     }
+//    // cancel Print
+//    public function cancelPrint($ids)
+//    {
+//        $meg = ['success' => false, 'fail_info' => null];
+//        if (!$ids) {
+//            $meg['fail_info'] = '没有选中需要重置打印标记的波次!';
+//            return $meg;
+//        }
+//        if (is_string($ids)) {
+//            $ids = [$ids];
+//        }
+//        $count = $this->verfifyIds($ids);
+//        if(!$count) {
+//            $meg['fail_info'] = "取消打印的波次中有不符合条件的波次";
+//            return $meg;
+//        }
+//        $cancelPrint = OracleDOCWaveHeader::whereIn("WAVENO", $ids)->update(['udfprintflag2' => 'N','UserDefine2'=>'']);
+//        if (!$cancelPrint) {
+//            $meg['fail_info'] = '没有选中需要重置打印标记的波次!';
+//            return $meg;
+//        }
+//        $meg['success'] = true;
+//        return $meg;
+//    }
 
     public function getWaveStatus()
     {