From a737e072be125f5db463d0c1f41784a3de66ff31 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Wed, 28 Dec 2022 14:34:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopOrderReleaseMapper.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml b/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml index 075b6a15..aa4a38f7 100644 --- a/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml +++ b/dispatch/src/main/resources/mapper/ShopOrderReleaseMapper.xml @@ -158,6 +158,12 @@ AND SO.SHOP_ORDER = #{shopOrder} + + AND SO.SHOP_ORDER IN + + #{shopOrderItem} + + AND CF1.VALUE LIKE '%'|| #{workOrder} || '%' From edff6b89a24a8ac11e791544de4c143b711f3527 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Wed, 28 Dec 2022 16:59:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anomaly/controller/ReportController.java | 15 +++++++++++++++ .../mesnac/anomaly/mapper/ReportMapper.java | 6 ++++++ .../mesnac/anomaly/service/ReportService.java | 7 +++++++ .../service/impl/ReportServiceImpl.java | 13 +++++++++++++ .../main/resources/mapper/ReportMapper.xml | 19 +++++++++++++++++++ .../meapi/controller/InventoryController.java | 18 ++++++++++++++++++ 6 files changed, 78 insertions(+) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java index 61f252ba..8af5e438 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/ReportController.java @@ -613,6 +613,21 @@ public class ReportController { } } + /** + * + * 上下料表维护 + * @param + * @return + */ + @GetMapping("/inventoryTableSave") + public R inventoryTableSave(@RequestParam(required = false) Map paramMap){ + try { + return R.ok(reportService.inventoryTableSave(paramMap)); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + /** * 工时看板 * @param diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java index d1756f23..fe5edea4 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/mapper/ReportMapper.java @@ -322,4 +322,10 @@ public interface ReportMapper { List> totalWorkingHoursCompletedThisYear(String workCenter); + /** + * 上下料表维护 + * @param paramMap + * @return + */ + List> inventoryTableSave(Map paramMap); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java index bf283295..69e1c893 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/ReportService.java @@ -313,4 +313,11 @@ public interface ReportService { * @return */ Map projectScheduleReportBoard(Map paramMap); + + /** + * 上下料表维护 + * @param paramMap + * @return + */ + List> inventoryTableSave(Map paramMap); } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java index 190faf6e..6aa32011 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/ReportServiceImpl.java @@ -1773,6 +1773,19 @@ public class ReportServiceImpl implements ReportService { return result; } + /** + * 上下料表维护 + * @param paramMap + * @return + */ + @Override + public List> inventoryTableSave(Map paramMap) { + String site = CommonMethods.getSite(); + paramMap.put("site", site); + paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); + return reportMapper.inventoryTableSave(paramMap); + } + /** * 工时统计报表 * @param paramMap diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index f0d06e2b..9fbc9610 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -3288,6 +3288,25 @@ SELECT zab.CREATED_DATE_TIME, GROUP BY M_MONTH.MONTH ORDER BY MONTH_MONTH + \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java index 3199a0e6..fcdeec76 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/InventoryController.java @@ -160,4 +160,22 @@ public class InventoryController { return R.failed("一个条码匹配多个数据！"); } + /** + * 批量保存批次号List + * @param inventoryList + * @return + */ + @ResponseBody + @PostMapping("saveInventoryList") + public R saveInventoryList(@RequestBody List inventoryList) { + try { + for (Inventory inventory : inventoryList) { + inventoryService.saveOrUpdate(inventory); + } + } catch (Exception e) { + return R.failed("保存数据失败：" + e.getMessage()); + } + return R.ok("保存数据成功"); + } + } \ No newline at end of file