From 7a3227174bde55918aef6f411489d0dd24c3b129 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期六, 21 十二月 2024 14:09:46 +0800 Subject: [PATCH] 工作历史档可搜索返修品 --- src/main/java/com/zy/asrs/controller/MobileController.java | 86 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 82 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 9608121..96b3c97 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -2,8 +2,6 @@ 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; @@ -13,6 +11,8 @@ import com.zy.asrs.entity.param.*; import com.zy.asrs.entity.result.MobileAdjustResult; import com.zy.asrs.mapper.ManLocDetlMapper; +import com.zy.asrs.mapper.OrderDetlMapper; +import com.zy.asrs.mapper.OrderMapper; import com.zy.asrs.service.*; import com.zy.common.model.WrkDto; import com.zy.common.web.BaseController; @@ -20,9 +20,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletRequest; +import javax.annotation.Resource; import java.util.*; -import java.util.List; /** * 绉诲姩绔帴鍙f帶鍒跺櫒 @@ -58,6 +57,12 @@ private WrkDetlLogService wrkDetlLogService; @Autowired private RgvOneSignService rgvOneSignService; + + @Resource + private OrderMapper orderMapper; + + @Resource + private OrderDetlMapper orderDetlMapper; // 鍟嗗搧涓婃灦 @@ -547,4 +552,77 @@ return R.ok("鍑哄簱鎴愬姛"); } + @PostMapping("/ckfh/auth") + @ManagerAuth(memo = "鍑哄簱澶嶆牳纭") + public synchronized R pakoutFhqr(@RequestBody PdckqrParam param) { + // 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍� + if(Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) || Cools.isEmpty(param.getMaterials())){ + return R.parse(BaseRes.PARAM); + } + return mobileService.pakoutFhqr(param); + } + + @PostMapping("/pdckqr/auth") + @ManagerAuth(memo = "鐩樼偣鍑哄簱纭") + public synchronized R pdckqr(@RequestBody PdckqrParam param) { + // 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍� + if(Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) || Cools.isEmpty(param.getMaterials())){ + return R.parse(BaseRes.PARAM); + } + return mobileService.pdckqr(param); + } + + @PostMapping("/pdtz/auth") + @ManagerAuth(memo = "鐩樼偣寮傚父鎸夊疄鐗╄皟鏁村簱瀛樹俊鎭�") + public synchronized R pdtz(@RequestBody PdtzParam param) { + return mobileService.pdtz(param); + } + + @PostMapping("/pdaWarehousingNow") + @ManagerAuth(memo = "pda缁勬墭绔嬪嵆鍏ュ簱") + public synchronized R pdaWarehousingNow(@RequestBody PdaWarehousingNowParam param) { + + // 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍� + if(Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) || Cools.isEmpty(param.getSourceStaNo())){ + return R.parse(BaseRes.PARAM); + } + return mobileService.pdaWarehousingNow(param, getUserId()); + + } + + + @PostMapping("/pdaFxprk") + @ManagerAuth(memo = "pda鍙嶄慨鍝佸叆搴�") + public synchronized R pdaFxprk(@RequestBody GwmsGenerateInventoryDto param) { + + return mobileService.pdaFxprk(param, getUserId()); + } + + @PostMapping("/pdaFhhd") + @ManagerAuth(memo = "pda鍙戣揣鏍稿") + public synchronized R pdaFhhd(@RequestBody PdaDhhdParam param) { + + if (Cools.isEmpty(param)) { + return R.parse("鍙傛暟鏈夎锛岃妫�鏌ュ弬鏁�"); + } + + return mobileService.pdaFhhd(param, getUserId()); + } + + @GetMapping("/getOrderNoList/{orderNo}") + @ManagerAuth(memo = "鎸夊崟鎹紪鍙锋ā绯婃煡璇㈠崟鎹�") + public synchronized R getOrderByLikeOrderNo(@PathVariable("orderNo") String orderNo) { + + return R.ok(orderMapper.selectOrderNosByOrderNoLike(orderNo)); + + } + + @GetMapping("/getOrderDetlByOrderNo/{orderNo}") + @ManagerAuth(memo = "鎸夊崟鎹紪鍙锋煡璇㈠崟鎹槑缁�") + public synchronized R getOrderByOrderNo(@PathVariable("orderNo") String orderNo) { + + return R.ok(orderDetlMapper.selectDetlList(orderNo)); + + } + } -- Gitblit v1.9.1