From 7c0ffec6ee60e5b0f2f9dc8312a7bbce3e20ac11 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 02 十二月 2022 15:59:27 +0800
Subject: [PATCH] #修改合同号

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 43b1323..c832de4 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -1,23 +1,27 @@
 package com.zy.asrs.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
 import com.core.common.Cools;
 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.OffSaleParam;
 import com.zy.asrs.entity.result.MobileAdjustResult;
+import com.zy.asrs.mapper.ManLocDetlMapper;
 import com.zy.asrs.service.*;
+import com.zy.common.model.LocDto;
+import com.zy.common.model.TaskDto;
 import com.zy.common.model.WrkDto;
 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.web.bind.annotation.*;
 
 import java.util.*;
 
@@ -38,6 +42,8 @@
     @Autowired
     private OrderService orderService;
     @Autowired
+    private OrderDetlService orderDetlService;
+    @Autowired
     private DocTypeService docTypeService;
     @Autowired
     private WrkMastService wrkMastService;
@@ -47,6 +53,26 @@
     private BasDevpService basDevpService;
     @Autowired
     private PackService packService;
+    @Autowired
+    private ManLocDetlMapper manLocDetlMapper;
+
+
+    // 鍟嗗搧涓婃灦
+    @RequestMapping("/mat/onSale/auth")
+    @ManagerAuth
+    public R matOnSale(@RequestBody CombParam combParam){
+        mobileService.onSale(combParam);
+        return R.ok("涓婃灦鎴愬姛");
+    }
+    // 鍟嗗搧涓嬫灦
+    @RequestMapping("/mat/offSale/auth")
+    //@ManagerAuth
+    public R matOffSale(@RequestBody OffSaleParam offSaleParam){
+        mobileService.offSale(offSaleParam);
+        return R.ok("涓嬫灦鎴愬姛");
+    }
+
+
 
     // 缁勬墭 ----------------------------------------------------------------------------------------------------
 
@@ -146,6 +172,16 @@
             return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
         }
         return R.ok();
+    }
+
+    // 鏍规嵁搴撲綅鐮佸拰鍟嗗搧鐮佹悳绱㈠晢鍝�
+    @RequestMapping("/mat/find/auth")
+    public R find(@RequestParam(required = false) String locNo
+            , @RequestParam(required = false) String matnr){
+        //List<ManLocDetl> manLocDetls = manLocDetlMapper.selectItem0(locNo, matnr);
+        ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(locNo, matnr);
+        return R.ok(manLocDetl);
+        //return R.ok(manLocDetlMapper.selectItem0(locNo, matnr));
     }
 
     /**
@@ -294,5 +330,14 @@
         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("鍑哄簱鎴愬姛");
+    }
 
 }

--
Gitblit v1.9.1