From a5990a214ba13119d617b4532e2b9eef2fe70cda Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期四, 12 九月 2024 14:09:01 +0800 Subject: [PATCH] mes接口对接 --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 2e72a50..67a7ab4 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -1667,6 +1667,29 @@ return R.ok(zphjcdwcVos); } + @Override + public R requestXhd(String barcode) { + + // 搴撳瓨鏄庣粏鏈ㄧ浣嶇疆闆嗗悎 + List<LocDetl> locDetls = locDetlMapper.selectList(new EntityWrapper<LocDetl>().eq("zpallet", barcode)); + List<String> collect1 = locDetls.stream().map(LocDetl::getOrigin).distinct().collect(Collectors.toList()); + // 宸ヤ綔鏄庣粏鏈ㄧ浣嶇疆闆嗗悎 + List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", barcode)); + List<String> collect2 = wrkDetls.stream().map(WrkDetl::getOrigin).distinct().collect(Collectors.toList()); + + // 0鏄庣粏寮傚父,1浜乏锛�2浜彸锛�3閮戒寒 + if (collect1.size() == 0 || collect2.size() == 0){ + return R.ok(0); + } else if((collect1.size() == 1 && collect2.size() == 1) || (collect1.size() == 2 && collect2.size() == 2)) { + return R.ok(3); + } else if(collect1.size() == 2 && collect2.size() == 1) { + return R.ok(collect2.get(0).equals("宸�") ? 1 : 2); + } else { + return R.parse("浜俊鍙风伅鏉$爜寮傚父锛�" + barcode); + } + + } + /** * 鍒涘缓妗佹灦鐞嗚揣鍑哄簱鐨勫伐浣滄。 */ -- Gitblit v1.9.1