From c2be773489f4541daba9650c24df5b8dadcf33a3 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期五, 06 十二月 2024 15:15:01 +0800 Subject: [PATCH] agv站点修改 --- src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java index f60d972..63d1b96 100644 --- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java +++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java @@ -10,7 +10,13 @@ import com.core.common.DateUtils; import com.core.common.R; import com.zy.asrs.entity.InventoryCheckOrder; +import com.zy.asrs.entity.InventoryCheckOrderDetl; +import com.zy.asrs.entity.WrkDetl; +import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.service.InventoryCheckOrderDetlService; import com.zy.asrs.service.InventoryCheckOrderService; +import com.zy.asrs.service.WrkDetlService; +import com.zy.asrs.service.WrkMastService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,6 +28,38 @@ @Autowired private InventoryCheckOrderService inventoryCheckOrderService; + @Autowired + private InventoryCheckOrderDetlService inventoryCheckOrderDetlService; + @Autowired + private WrkMastService wrkMastService; + @Autowired + private WrkDetlService wrkDetlService; + + @RequestMapping("/inventoryCheckOrder/StockCheck/select/barcode") + @ManagerAuth() + public R StockCheckSelectBarcode(@RequestParam String barcode) { + if (Cools.isEmpty(barcode)) { + return R.ok(); + } + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode)); + if (Cools.isEmpty(wrkMast)) { + return R.error("璇ユ潯鐮佹湭鏌ヨ鍒扮洏鐐逛换鍔�"); + } + ArrayList<InventoryCheckOrderDetl> checkOrderDetls = new ArrayList<>(); + List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); + for (WrkDetl wrkDetl : wrkDetls) { + InventoryCheckOrderDetl checkDetl = inventoryCheckOrderDetlService.selectOne(new EntityWrapper<InventoryCheckOrderDetl>() + .eq("order_no", wrkMast.getSheetNo()) + .eq("matnr", wrkDetl.getMatnr()) + .eq("batch", wrkDetl.getBatch())); + if (Cools.isEmpty(checkDetl)) { + continue; + } + checkOrderDetls.add(checkDetl); + + } + return R.ok(checkOrderDetls); + } @RequestMapping("/inventoryCheckOrder/select/status/1") @ManagerAuth() -- Gitblit v1.9.1