From fef3b0760b7394847f143151e8bdce238290e1dc Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期四, 18 八月 2022 12:36:32 +0800
Subject: [PATCH] Revert "#"

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   62 ++++++++++++++++++++++++++++--
 1 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4610846..08ee0f9 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,24 +1,35 @@
 package com.zy.asrs.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.AppAuth;
 import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
 import com.core.common.Cools;
+import com.core.common.DateUtils;
 import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.CombParam;
 import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.Review;
 import com.zy.asrs.entity.result.MobileAdjustResult;
 import com.zy.asrs.service.*;
+import com.zy.asrs.task.handler.WorkLogHandler;
+import com.zy.common.constant.MesConstant;
+import com.zy.common.model.LocDto;
+import com.zy.common.model.TaskDto;
 import com.zy.common.model.WrkDto;
+import com.zy.common.utils.HttpHandler;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 /**
@@ -38,6 +49,8 @@
     @Autowired
     private OrderService orderService;
     @Autowired
+    private OrderDetlService orderDetlService;
+    @Autowired
     private DocTypeService docTypeService;
     @Autowired
     private WrkMastService wrkMastService;
@@ -47,6 +60,16 @@
     private BasDevpService basDevpService;
     @Autowired
     private PackService packService;
+
+
+    // 鍟嗗搧涓婃灦
+    @RequestMapping("/mat/onSale/auth")
+    //@ManagerAuth
+    public R matOnSale(@RequestBody CombParam combParam){
+        mobileService.onSale(combParam);
+        return R.ok("涓婃灦鎴愬姛");
+    }
+    // 鍟嗗搧涓嬫灦
 
     // 缁勬墭 ----------------------------------------------------------------------------------------------------
 
@@ -142,7 +165,7 @@
         if (wrkMast != null) {
             List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
             // 鍘婚櫎宸插嚭搴撶‘璁ょ殑鏄庣粏
-            wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() == 1);
+            wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0);
             return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
         }
         return R.ok();
@@ -294,5 +317,34 @@
         return R.ok("鐩樼偣鎴愬姛");
     }
 
+    @PostMapping("/order/out/pakout/auth")
+    @ManagerAuth(memo = "璁㈠崟鍑哄簱")
+    public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
+        if(!param.containsKey("staNo") || !param.containsKey("orderNo")){
+            return R.parse(BaseRes.PARAM);
+        }
+        mobileService.pakoutByOrder(param,getUserId());
+        return R.ok("鍑哄簱鎴愬姛");
+    }
+
+
+    /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+    @PostMapping("/test/startUp/auth")
+    @ManagerAuth(memo = "鐢宠PACK娴嬭瘯")
+    public synchronized R startUpTestPACK(@RequestBody TestMast testMast) {
+        if (Cools.isEmpty(testMast)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        mobileService.startUpTestPACK(testMast); //鎻愪氦娴嬭瘯绯荤粺
+        return R.ok();
+    }
+    @PostMapping("/test/suspend/auth")
+//    @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
+    public synchronized R suspendTestPACK() {
+        mobileService.suspendTestPACK();  //璇锋眰鏆傚仠娴嬭瘯
+        return R.ok();
+    }
+    /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+
 
 }

--
Gitblit v1.9.1