From f5d06ddef53dc810e2aa53ab8cf1969faff9a7c9 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 07 五月 2022 23:29:06 +0800 Subject: [PATCH] # --- src/main/resources/mapper/WrkDetlMapper.xml | 1 + src/main/java/com/zy/asrs/controller/MobileController.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index 55dc50c..4b690b8 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -108,7 +108,7 @@ // 鍑哄簱 --------------------------------------------------------------------------------------------------- @RequestMapping("/pakout/query/auth") -// @ManagerAuth + @ManagerAuth public R pakoutQuery(@RequestParam(required = false) String barcode, @RequestParam(required = false) Integer staNo, @RequestParam(required = false) String matnr){ @@ -129,7 +129,7 @@ } @RequestMapping("/pakout/confirm/auth") -// @ManagerAuth + @ManagerAuth @Transactional public R pakoutConfirm(@RequestBody List<WrkDetl> list) { if (Cools.isEmpty(list)) { @@ -160,7 +160,7 @@ } } } - return R.ok(); + return R.ok("瀹屾垚纭"); } diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml index 22e22ef..225f31e 100644 --- a/src/main/resources/mapper/WrkDetlMapper.xml +++ b/src/main/resources/mapper/WrkDetlMapper.xml @@ -103,6 +103,7 @@ left join asr_wrk_mast awm on awd.wrk_no = awm.wrk_no where 1=1 and awm.wrk_sts = 14 + and (awd.inspect is null or awd.inspect = 0) and awm.sta_no = #{staNo} and awd.matnr + '-' + awd.batch = #{matnr} </select> -- Gitblit v1.9.1