From 2d836c8b6a270b7007e1a2e1e9962cb9dcd8b6f6 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 01 四月 2024 14:47:36 +0800 Subject: [PATCH] 入库接驳位空板自动出库 全班出库后自动空板入库 --- src/main/java/com/zy/asrs/controller/OrderController.java | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java index 9cf0b36..7db8719 100644 --- a/src/main/java/com/zy/asrs/controller/OrderController.java +++ b/src/main/java/com/zy/asrs/controller/OrderController.java @@ -156,7 +156,7 @@ for (OrderDetl orderDetl : param.getOrderDetlList()) { DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch()); if (DetlDto.has(list, dto)) { - OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch()); + OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime()); item.setAnfme(item.getAnfme() + orderDetl.getAnfme()); if (!orderDetlService.updateById(item)) { throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗eけ璐�"); @@ -209,7 +209,7 @@ for (OrderDetl orderDetl : param.getOrderDetlList()) { DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch()); if (DetlDto.has(list, dto)) { - OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch()); + OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getThreeCode(),orderDetl.getDeadTime()); item.setAnfme(item.getAnfme() + orderDetl.getAnfme()); if (!orderDetlService.updateById(item)) { throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗eけ璐�"); @@ -356,14 +356,14 @@ @Transactional public R delete(@RequestParam Long orderId){ orderService.remove(orderId); -// Order order = orderService.selectById(orderId); -// if (order != null) { -// order.setStatus(0); -// } -// if (!orderService.updateById(order)) { -// throw new CoolException("鍒犻櫎璁㈠崟澶辫触"); -// } -// orderDetlService.modifyStatus(orderId, 0); + return R.ok(); + } + + @RequestMapping(value = "/order/report/auth") + @ManagerAuth(memo = "鎵嬪姩涓婁紶璁㈠崟") + @Transactional + public R report(@RequestParam Long orderId){ + orderService.report(orderId,getUser().getUsername()); return R.ok(); } @@ -441,14 +441,18 @@ Row row = sheet.getRow(i); // 璁㈠崟缂栧彿 String uuid = dataFormatter.formatCellValue(row.getCell(0)); - // 鍟嗗搧鍚嶇О + // 鐗╂枡鍙� String maktx = dataFormatter.formatCellValue(row.getCell(1)); - // 鍟嗗搧缂栫爜 + // 鐗╂枡鍙� String matnr = dataFormatter.formatCellValue(row.getCell(2)); // 鏁伴噺 Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3))); // 涓嬪崟鏃堕棿 String timeStr = dataFormatter.formatCellValue(row.getCell(4)); + // 閿�鍞鍗曞彿 + String csocode = dataFormatter.formatCellValue(row.getCell(5)); + // 閿�鍞鍗曡鍙� + String isocode = dataFormatter.formatCellValue(row.getCell(6)); Date time = null; try { time = DateUtils.convert(timeStr, DateUtils.yyyyMMddHHmmss_F); @@ -497,9 +501,9 @@ null, // 鐗╂祦鍗曞彿 1L, // 璁㈠崟鐘舵�� 1, // 鐘舵�� - 9527L, // 娣诲姞浜哄憳 + userId, // 娣诲姞浜哄憳 now, // 娣诲姞鏃堕棿 - 9527L, // 淇敼浜哄憳 + userId, // 淇敼浜哄憳 now, // 淇敼鏃堕棿 null // 澶囨敞 ); @@ -508,7 +512,7 @@ } } - OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), matnr, null); + OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), matnr, null,csocode,isocode); if (orderDetl == null) { orderDetl = new OrderDetl(); orderDetl.sync(mat); @@ -516,9 +520,9 @@ orderDetl.setAnfme(anfme); orderDetl.setOrderId(order.getId()); orderDetl.setOrderNo(order.getOrderNo()); - orderDetl.setCreateBy(9527L); + orderDetl.setCreateBy(userId); orderDetl.setCreateTime(now); - orderDetl.setUpdateBy(9527L); + orderDetl.setUpdateBy(userId); orderDetl.setUpdateTime(now); orderDetl.setStatus(1); orderDetl.setQty(0.0D); @@ -526,7 +530,7 @@ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�"); } } else { - if(!orderDetlService.increaseAnfme(order.getId(), matnr, null, anfme)) { + if(!orderDetlService.increaseAnfme(order.getId(), matnr, null, anfme,csocode,isocode)) { throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃閲嶆柊瀵煎叆锛�"); } } -- Gitblit v1.9.1