From 9b50ae798149b64f9e3413897ff96d4084a9a7aa Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 23 三月 2022 10:06:36 +0800 Subject: [PATCH] #杰克缝纫机立库 【优化单据管理】 --- src/main/java/com/zy/asrs/controller/OpenController.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index 9f69496..0a87815 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -28,6 +28,7 @@ @RequestMapping("/open/api") public class OpenController { + private boolean pickSite = false; @Autowired private LocDetlService locDetlService; @Autowired @@ -162,7 +163,7 @@ detlDtos.add(dto); workService.stockOut(staNo, detlDtos, 101, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()), locDetl.getAnfme()-issued); } else { - BasDevp staNo = basDevpService.checkSiteStatus(113); + BasDevp staNo = basDevpService.checkSiteStatus(pickSite?113:109); List<LocDetlDto> detlDtos = new ArrayList<>(); LocDetlDto dto = new LocDetlDto(); dto.setLocDetl(locDetl); @@ -187,7 +188,7 @@ } } - + pickSite = !pickSite; return R.ok().add(result); } @@ -264,7 +265,7 @@ dto.setLocDetl(locDetl); dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued); detlDtos.add(dto); - workService.stockOut(staNo, detlDtos, 101, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo())); + workService.stockOut(staNo, detlDtos, 101, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()), null); } else { // 鎷f枡 BasDevp staNo = basDevpService.checkSiteStatus(107); List<LocDetlDto> detlDtos = new ArrayList<>(); @@ -272,7 +273,7 @@ dto.setLocDetl(locDetl); dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued); detlDtos.add(dto); - workService.stockOut(staNo, detlDtos, 103, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo())); + workService.stockOut(staNo, detlDtos, 103, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()), null); } PakoutVo pakoutVo = new PakoutVo(); pakoutVo.setLocNo(locDetl.getLocNo()); -- Gitblit v1.9.1