Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs

whycq

2022-05-08 edbf54064b70a6311a98eeefc7516a35287e6b44

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -121,12 +121,8 @@
        }
        if (!Cools.isEmpty(matnr)) {
            if (!Cools.isEmpty(staNo)) {
                List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", staNo).eq("wrk_sts", 14L));
                if (!Cools.isEmpty(wrkMasts)) {
                    WrkMast wrkMast = wrkMasts.get(0);
                    List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
                    return R.ok().add(wrkDetls);
                }
            }
        }
        return R.ok();
@@ -164,7 +160,7 @@
                }
            }
        }
        return R.ok();
        return R.ok("完成确认");
    }