From 6ce9f469e0f5dd016c4d38a1f9e4578e91adba87 Mon Sep 17 00:00:00 2001 From: "1009473166@qq.com" <草拟吗23> Date: Mon, 27 Apr 2026 16:02:27 +0800 Subject: [PATCH] =?UTF-8?q?2026.4.27=20=E5=A4=A7=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/BatchNoGenerator.java | 78 +++ .../api/controller/ToErpApiController.java | 46 +- .../com/ruoyi/api/domain/AgvMoveParam.java | 1 - .../com/ruoyi/api/domain/CallBackErp.java | 9 +- .../ruoyi/api/domain/CallBackErpItems.java | 4 +- .../api/domain/DeliveryNoticeItemVo.java | 64 +-- .../ruoyi/api/domain/DeliveryNoticeVo.java | 6 +- .../com/ruoyi/api/service/IToWcsService.java | 2 - .../api/service/impl/ToErpServiceImpl.java | 97 ++-- .../api/service/impl/ToWcsServiceImpl.java | 15 - .../api/service/impl/TwinServiceImpl.java | 2 +- .../controller/CheckStockinController.java | 38 +- .../service/ICheckStockinService.java | 2 +- .../service/impl/CheckStockinServiceImpl.java | 15 +- .../ruoyi/in/stockin/domain/InStockin.java | 208 ++++---- .../in/stockinback/domain/InStockinBack.java | 19 +- .../domain/InStockinDetailBack.java | 2 +- .../mapper/InStockinDetailBackMapper.java | 18 +- .../service/IInStockinDetailBackService.java | 2 +- .../impl/InStockinDetailBackServiceImpl.java | 4 +- .../stockindetail/domain/InStockinDetail.java | 111 +--- .../mapper/InStockinDetailMapper.java | 2 - .../service/IInStockinDetailService.java | 3 - .../impl/InStockinDetailServiceImpl.java | 3 - .../ruoyi/log/service/IRequestLogService.java | 5 +- .../service/impl/RequestLogServiceImpl.java | 83 ++- .../controller/OutStockoutController.java | 9 +- .../out/outStockout/domain/OutStockout.java | 1 - .../service/impl/OutStockoutServiceImpl.java | 1 - .../domain/OutStockoutBack.java | 2 + .../domain/OutStockoutDetail.java | 30 +- .../mapper/OutStockoutDetailBackMapper.java | 5 + .../IOutStockoutDetailBackService.java | 4 + .../OutStockoutDetailBackServiceImpl.java | 10 + .../ruoyi/pda/controller/PdaController.java | 55 +- .../ruoyi/pda/domain/TrayCodeMakeSure.java | 4 + .../java/com/ruoyi/pda/mapper/PdaMapper.java | 2 + .../com/ruoyi/pda/service/PdaService.java | 8 +- .../com/ruoyi/pda/service/PdaServiceImp.java | 66 ++- .../stock/stock/mapper/BasStockMapper.java | 2 + .../src/main/resources/application-druid.yml | 4 +- .../mapper/agv/AgvContainerTaskMapper.xml | 21 +- .../resources/mapper/ai/ChatMessageMapper.xml | 17 +- .../mapper/ai/ConversationsMapper.xml | 25 +- .../mapper/api/KnowledgeFileMapper.xml | 24 +- .../resources/mapper/api/MoveMsgMapper.xml | 26 +- .../mapper/bas/BasContainerDetailsMapper.xml | 18 +- .../mapper/bas/BasContainerMapper.xml | 14 +- .../mapper/bas/BasCustomerMapper.xml | 6 +- .../resources/mapper/bas/BasJobIdMapper.xml | 41 +- .../mapper/bas/BasProductCodeMapper.xml | 20 +- .../mapper/bas/BasProductPortMapper.xml | 10 +- .../mapper/bas/BasProductPortRelMapper.xml | 11 +- .../resources/mapper/bas/BasRoadwayMapper.xml | 18 +- .../mapper/bas/BasSupplierMapper.xml | 6 +- .../resources/mapper/bas/BasTagMapper.xml | 19 +- .../mapper/bas/BasTraycodeFormatMapper.xml | 10 +- .../mapper/bas/BasTraycodeMapper.xml | 11 +- .../mapper/bas/BasWarehousePortMapper.xml | 10 +- .../bas/cargoSpace/BasCargoSpaceMapper.xml | 53 +- .../bas/warehouse/BasWarehouseMapper.xml | 13 +- .../mapper/check/CheckCommitRecordMapper.xml | 18 +- .../CheckDifferenceRecordFinishMapper.xml | 31 +- .../check/CheckDifferenceRecordMapper.xml | 31 +- .../check/CheckStockinDetailFinishMapper.xml | 115 ++--- .../mapper/check/CheckStockinDetailMapper.xml | 59 +-- .../mapper/check/CheckStockinFinishMapper.xml | 75 +-- .../mapper/check/CheckStockinMapper.xml | 39 +- .../mapper/in/InStockinBackMapper.xml | 54 +- .../mapper/in/InStockinDetailBackMapper.xml | 95 ++-- .../mapper/in/InStockinDetailFinishMapper.xml | 115 ++--- .../mapper/in/InStockinDetailMapper.xml | 68 ++- .../mapper/in/InStockinFinishMapper.xml | 75 +-- .../resources/mapper/in/InStockinMapper.xml | 41 +- .../mapper/in/TransferBillCallbackMapper.xml | 20 +- .../mapper/job/MydoJobDetailFinishMapper.xml | 55 +- .../mapper/job/MydoJobDetailMapper.xml | 65 +-- .../mapper/job/MydoJobFinishMapper.xml | 87 ++-- .../resources/mapper/job/MydoJobMapper.xml | 47 +- .../mapper/agv/AgvContainerTaskMapper.xml | 105 ++++ .../mapper/mapper/ai/ChatMessageMapper.xml | 118 +++++ .../mapper/mapper/ai/ConversationsMapper.xml | 108 ++++ .../mapper/mapper/api/JobStatisticsMapper.xml | 36 ++ .../mapper/mapper/api/KnowledgeFileMapper.xml | 106 ++++ .../mapper/mapper/api/MoveMsgMapper.xml | 108 ++++ .../mapper/bas/BasContainerDetailsMapper.xml | 93 ++++ .../mapper/mapper/bas/BasContainerMapper.xml | 105 ++++ .../mapper/mapper/bas/BasCustomerMapper.xml | 152 ++++++ .../mapper/mapper/bas/BasJobIdMapper.xml | 165 ++++++ .../mapper/bas/BasProductCodeMapper.xml | 132 +++++ .../mapper/mapper/bas/BasProductMapper.xml | 290 +++++++++++ .../mapper/bas/BasProductPortMapper.xml | 77 +++ .../mapper/bas/BasProductPortRelMapper.xml | 115 +++++ .../mapper/mapper/bas/BasRoadwayMapper.xml | 93 ++++ .../mapper/mapper/bas/BasSupplierMapper.xml | 142 +++++ .../mapper/mapper/bas/BasTagMapper.xml | 96 ++++ .../mapper/mapper/bas/BasTaskNoMapper.xml | 48 ++ .../mapper/bas/BasTraycodeFormatMapper.xml | 106 ++++ .../mapper/mapper/bas/BasTraycodeMapper.xml | 101 ++++ .../mapper/bas/BasWarehousePortMapper.xml | 73 +++ .../bas/cargoSpace/BasCargoSpaceMapper.xml | 237 +++++++++ .../bas/warehouse/BasWarehouseMapper.xml | 114 +++++ .../mapper/check/CheckCommitRecordMapper.xml | 82 +++ .../CheckDifferenceRecordFinishMapper.xml | 203 ++++++++ .../check/CheckDifferenceRecordMapper.xml | 203 ++++++++ .../check/CheckStockinDetailFinishMapper.xml | 286 +++++++++++ .../mapper/check/CheckStockinDetailMapper.xml | 238 +++++++++ .../mapper/check/CheckStockinFinishMapper.xml | 197 +++++++ .../mapper/check/CheckStockinMapper.xml | 186 +++++++ .../mapper/mapper/in/InStockinBackMapper.xml | 173 +++++++ .../mapper/in/InStockinDetailBackMapper.xml | 300 +++++++++++ .../mapper/in/InStockinDetailFinishMapper.xml | 291 +++++++++++ .../mapper/in/InStockinDetailMapper.xml | 347 +++++++++++++ .../mapper/in/InStockinFinishMapper.xml | 244 +++++++++ .../mapper/mapper/in/InStockinMapper.xml | 246 +++++++++ .../mapper/in/TransferBillCallbackMapper.xml | 95 ++++ .../mapper/index/BillStatusCountMapper.xml | 34 ++ .../mapper/index/CargoSpaceCountMapper.xml | 16 + .../mapper/mapper/index/IndexCountMapper.xml | 28 + .../mapper/index/ViewIndexJobMapper.xml | 26 + .../mapper/index/WeekJobCountMapper.xml | 39 ++ .../mapper/job/MydoJobDetailFinishMapper.xml | 302 +++++++++++ .../mapper/mapper/job/MydoJobDetailMapper.xml | 426 +++++++++++++++ .../mapper/mapper/job/MydoJobFinishMapper.xml | 263 ++++++++++ .../mapper/mapper/job/MydoJobMapper.xml | 282 ++++++++++ .../mapper/mapper/mp/UserlMapper.xml | 8 + .../mapper/out/OutExceptionRecordMapper.xml | 86 ++++ .../mapper/mapper/out/OutPickSubmitMapper.xml | 101 ++++ .../mapper/out/OutStockoutBackMapper.xml | 225 ++++++++ .../out/OutStockoutDetailBackMapper.xml | 320 ++++++++++++ .../out/OutStockoutDetailFinishMapper.xml | 262 ++++++++++ .../mapper/out/OutStockoutDetailMapper.xml | 259 ++++++++++ .../mapper/out/OutStockoutFinishMapper.xml | 168 ++++++ .../mapper/mapper/out/OutStockoutMapper.xml | 249 +++++++++ .../mapper/out/ViewHandAllotStockMapper.xml | 264 ++++++++++ .../resources/mapper/mapper/pda/PdaMapper.xml | 168 ++++++ .../mapper/mapper/pda/TrayMsgMapper.xml | 81 +++ .../ViewProductAndStockMapper.xml | 157 ++++++ .../ReceiveStockinDetailFinishMapper.xml | 260 ++++++++++ .../receive/ReceiveStockinDetailMapper.xml | 205 ++++++++ .../receive/ReceiveStockinFinishMapper.xml | 237 +++++++++ .../mapper/receive/ReceiveStockinMapper.xml | 198 +++++++ .../requestInterface/RequestLogMapper.xml | 121 +++++ .../mapper/search/StockSummaryMapper.xml | 415 +++++++++++++++ .../search/ViewFlatWarehouseInFlowMapper.xml | 184 +++++++ .../search/ViewFlatWarehouseOutFlowMapper.xml | 184 +++++++ .../mapper/search/ViewInJobFlowMapper.xml | 293 +++++++++++ .../mapper/search/ViewOutJobFlowMapper.xml | 293 +++++++++++ .../mapper/search/ViewStockDetailMapper.xml | 249 +++++++++ .../mapper/search/ViewStockSecureMapper.xml | 484 ++++++++++++++++++ .../mapper/search/ViewStockWarningMapper.xml | 484 ++++++++++++++++++ .../search/ViewStockinHistoryMapper.xml | 243 +++++++++ .../search/ViewStockoutHistoryMapper.xml | 203 ++++++++ .../stock/BasStockFreezeRecordMapper.xml | 147 ++++++ .../stock/BasStockMaintainRecordMapper.xml | 147 ++++++ .../mapper/mapper/stock/BasStockMapper.xml | 264 ++++++++++ .../mapper/work/ViewNoDoneOutWorkMapper.xml | 31 ++ .../mapper/out/OutExceptionRecordMapper.xml | 18 +- .../mapper/out/OutPickSubmitMapper.xml | 24 +- .../mapper/out/OutStockoutBackMapper.xml | 96 ++-- .../out/OutStockoutDetailBackMapper.xml | 259 ++++++---- .../out/OutStockoutDetailFinishMapper.xml | 61 +-- .../mapper/out/OutStockoutDetailMapper.xml | 149 +++--- .../mapper/out/OutStockoutFinishMapper.xml | 67 +-- .../mapper/out/OutStockoutMapper.xml | 52 +- .../mapper/out/ViewHandAllotStockMapper.xml | 82 +-- .../main/resources/mapper/pda/PdaMapper.xml | 4 +- .../resources/mapper/pda/TrayMsgMapper.xml | 10 +- .../ViewProductAndStockMapper.xml | 63 +-- .../ReceiveStockinDetailFinishMapper.xml | 103 ++-- .../receive/ReceiveStockinDetailMapper.xml | 53 +- .../receive/ReceiveStockinFinishMapper.xml | 75 +-- .../mapper/receive/ReceiveStockinMapper.xml | 39 +- .../requestInterface/RequestLogMapper.xml | 32 +- .../mapper/search/ViewInJobFlowMapper.xml | 86 ++-- .../mapper/search/ViewOutJobFlowMapper.xml | 84 +-- .../mapper/search/ViewStockDetailMapper.xml | 70 +-- .../mapper/search/ViewStockSecureMapper.xml | 16 +- .../mapper/search/ViewStockWarningMapper.xml | 14 +- .../search/ViewStockinHistoryMapper.xml | 78 +-- .../search/ViewStockoutHistoryMapper.xml | 58 +-- .../stock/BasStockFreezeRecordMapper.xml | 33 +- .../stock/BasStockMaintainRecordMapper.xml | 33 +- .../resources/mapper/stock/BasStockMapper.xml | 137 +++-- 184 files changed, 16502 insertions(+), 2016 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/api/controller/BatchNoGenerator.java create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/agv/AgvContainerTaskMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/ai/ChatMessageMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/ai/ConversationsMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/api/JobStatisticsMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/api/KnowledgeFileMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/api/MoveMsgMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerDetailsMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasCustomerMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasJobIdMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductCodeMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortRelMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasRoadwayMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasSupplierMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTagMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTaskNoMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeFormatMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/BasWarehousePortMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/bas/warehouse/BasWarehouseMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckCommitRecordMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordFinishMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailFinishMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinFinishMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinBackMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailBackMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailFinishMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinFinishMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/in/TransferBillCallbackMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/index/BillStatusCountMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/index/CargoSpaceCountMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/index/IndexCountMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/index/ViewIndexJobMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/index/WeekJobCountMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailFinishMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobFinishMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/mp/UserlMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutExceptionRecordMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutPickSubmitMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutBackMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailBackMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailFinishMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutFinishMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/out/ViewHandAllotStockMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/pda/TrayMsgMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/productAndStock/ViewProductAndStockMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailFinishMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinFinishMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/requestInterface/RequestLogMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/StockSummaryMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseInFlowMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseOutFlowMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewInJobFlowMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewOutJobFlowMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockDetailMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockSecureMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockWarningMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockinHistoryMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockoutHistoryMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockFreezeRecordMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMaintainRecordMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMapper.xml create mode 100644 ruoyi-admin/src/main/resources/mapper/mapper/work/ViewNoDoneOutWorkMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/BatchNoGenerator.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/BatchNoGenerator.java new file mode 100644 index 0000000..96ecd84 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/BatchNoGenerator.java @@ -0,0 +1,78 @@ +package com.ruoyi.api.controller; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; + +public class BatchNoGenerator{ + // 日期格式化模板：固定生成 yyyyMMdd 格式 + private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd"); + + // 原子引用：存储当前日期，CAS保证【日期判断+重置】的原子性 + private static final AtomicReference CURRENT_DATE = + new AtomicReference<>(LocalDate.now().format(DATE_FORMATTER)); + + // 原子整数：流水号计数器，CPU级指令保证自增原子性 + private static final AtomicInteger SERIAL_NUMBER = new AtomicInteger(1); + + // 流水号最大长度（4位，最大值9999） + private static final int MAX_SERIAL = 9999; + private static final String SERIAL_FORMAT = "%04d"; + + /** + * 生成唯一批号（多线程安全，原子操作） + * @return yyyyMMdd+4位流水号 + */ + public static String generateBatchNo() { + // 获取当前系统日期 + String today = LocalDate.now().format(DATE_FORMATTER); + + // CAS自旋：保证日期判断、重置、计数的原子性 + while (true) { + // 读取缓存的日期 + String cacheDate = CURRENT_DATE.get(); + + // 场景1：当天未跨天，直接生成流水号 + if (today.equals(cacheDate)) { + // 原子自增获取当前序号 + int currentNum = SERIAL_NUMBER.getAndIncrement(); + + // 防止4位流水号溢出（超过9999） + if (currentNum > MAX_SERIAL) { + // 重置序号，抛出异常提示 + SERIAL_NUMBER.set(1); + throw new RuntimeException("当日批号已达上限：" + MAX_SERIAL); + } + + // 拼接日期+4位流水号，返回结果 + return today + String.format(SERIAL_FORMAT, currentNum); + } + + // 场景2：跨天了，CAS原子更新日期并重置流水号 + if (CURRENT_DATE.compareAndSet(cacheDate, today)) { + // 只有一个线程能执行到这里，重置为1 + SERIAL_NUMBER.set(1); + return today + String.format(SERIAL_FORMAT, 1); + } + + // CAS更新失败：说明其他线程已完成跨天重置，重新循环 + } + } + + public static void main(String[] args) throws InterruptedException { + // 模拟20个线程同时生成批号 + for (int i = 0; i < 20; i++) { + new Thread(() -> { + String batchNo = generateBatchNo(); + System.out.println("线程：" + Thread.currentThread().getName() + "，生成批号：" + batchNo); + }).start(); + } + + Thread.sleep(1000); + System.out.println("=== 所有批号生成完成，无重复、无乱序 ==="); + } +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java index 1621a26..fce45dc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java @@ -31,24 +31,13 @@ public class ToErpApiController { public AjaxResult receiveDeliveryNotice(@RequestBody DeliveryNoticeVo deliveryNoticeVo) { AjaxResult ajaxResult = toErpService.receiveDeliveryNotice(deliveryNoticeVo); - requestLogService.insertRequestLog(requestLogService.getRequestLog(JSONUtil.toJsonStr(deliveryNoticeVo), "接收入出库通知单", ajaxResult)); + requestLogService.insertRequestLog(requestLogService.getRequestLogERP(JSONUtil.toJsonStr(deliveryNoticeVo), "接收入出库通知单", ajaxResult)); return ajaxResult; } - /** - * 回传入库单（废弃） - */ - //@Scheduled(fixedDelay = 1500) - @RequestMapping("/callbackInDeliveryNotice") - @ResponseBody - public void callbackInDeliveryNotice() { - toErpService.callbackInDeliveryNotice(); - } - - /** * 回传入库单 */ @@ -63,26 +52,37 @@ public class ToErpApiController { /** * 回传出库单(新) */ - // @Scheduled(fixedDelay = 1500) + @Scheduled(fixedDelay = 1500) @RequestMapping("/callbackOutDeliveryNotice") @ResponseBody public void callbackDeliveryOutNoticeNew() { toErpService.callbackDeliveryOutNoticeNew(); } - /** - * 回传其他出库单(废弃) - */ -// @Scheduled(fixedDelay = 1500) - @RequestMapping("/callbackOutDeliveryNotice") - @ResponseBody - public void callbackDeliveryOutNotice() { - toErpService.callbackoutDeliveryNotice(); - } + +// /** +// * 回传其他入库单 +// */ +// @Scheduled(fixedDelay = 1500) +// @RequestMapping("/callbackInDeliveryNotice") +// @ResponseBody +// public void callbackInDeliveryNotice() { +// toErpService.callbackInDeliveryNotice(); +// } +// +// /** +// * 回传其他出库单 +// */ +// @Scheduled(fixedDelay = 1500) +// @RequestMapping("/callbackOutDeliveryNotice") +// @ResponseBody +// public void callbackDeliveryOutNotice() { +// toErpService.callbackoutDeliveryNotice(); +// } /** * 移库回调接口 */ -// @Scheduled(fixedDelay = 1500) + @Scheduled(fixedDelay = 1500) @RequestMapping("/moveCargoSpace") @ResponseBody public void moveCargoSpace(){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/AgvMoveParam.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/AgvMoveParam.java index 300b761..238bad3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/AgvMoveParam.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/AgvMoveParam.java @@ -12,5 +12,4 @@ public class AgvMoveParam { private String endPoint; private String containerCode; private String taskNo; - private String type; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErp.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErp.java index f5c48c7..90bd28f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErp.java @@ -2,13 +2,17 @@ package com.ruoyi.api.domain; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import java.io.Serializable; import java.util.List; @NoArgsConstructor @Data +@Getter +@Setter public class CallBackErp implements Serializable { /** @@ -55,9 +59,12 @@ public class CallBackErp implements Serializable { private String cmemo; // 账套号 @JsonProperty("cacc_id") - private String caccId; + private String cacc_id; // 子明细 @JsonProperty("details") private List details; + + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java index 7059a1f..af292ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java @@ -33,7 +33,7 @@ public class CallBackErpItems implements Serializable { @JsonProperty("cinvstd") private String cinvstd; @JsonProperty("cinvm_unit") - private String cinvmUnit; + private String cinvm_unit; @JsonProperty("cposcode") private String cposcode; @JsonProperty("cposname") @@ -56,5 +56,7 @@ public class CallBackErpItems implements Serializable { private String srcrowno; @JsonProperty("binvbatch") private Integer binvbatch; + @JsonProperty("jobid") + private String jobid; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java index 36b6577..f538835 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java @@ -18,72 +18,44 @@ import java.util.List; public class DeliveryNoticeItemVo { - /** - * 行号 - */ + /** 行号 */ private String lineNo; - /** - * 对应通知行号 - */ + /** 对应通知行号 */ private String notelineNo; - /** - * 单据号 - */ + /** 单据号 */ private String billNo; - /** - * 存货编码 - */ + /** 存货编码 */ private String inventoryCode; - /** - * 存货名称 - */ + /** 存货名称 */ private String inventoryName; - /** - * 规格型号 - */ + /** 规格型号 */ private String specModel; - /** - * 层级关系 - */ + /** 层级关系 */ private String levelRelation; - /** - * 上层物料 - */ + /** 上层物料 */ private String upperMaterial; - /** - * 顶层物料 - */ + /** 顶层物料 */ private String topMaterial; - /** - * 批次 - */ + /** 批次 */ private String lotNo; - /** - * 计量单位 - */ + /** 计量单位 */ private String unit; - /** - * 数量 - */ + /** 数量 */ private String quantity; - /** - * 备注 - */ + /** 备注 */ private String remark; private List locations; - /** - * 货位 - */ + /**货位*/ private String area; - /** - * 托盘 - */ + /**托盘*/ private String location; private String areaBefore; private String locationBefore; + /** 项目号 */ + private String projectNo; /** * erp子表主键 ***/ @@ -100,4 +72,6 @@ public class DeliveryNoticeItemVo { /**旧项目号**/ private String oldProjectNo; + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeVo.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeVo.java index e712ad8..88f545e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeVo.java @@ -53,11 +53,13 @@ public class DeliveryNoticeVo { private String destination; /** 领料车间 */ private String workshop; - /** 公司简称**/ + + private String companyShortName; /** 账套号**/ private String accountSetNo; - /** 子表明细列表 */ + + private List detailList; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java index 165fda8..ffb310e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java @@ -45,6 +45,4 @@ public interface IToWcsService { AjaxResult updateWcsPort(WcsPort wcsPort); - AjaxResult insertAgvMoveJob(AgvMoveParam agvMoveParam); - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java index 4a66846..2394501 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java @@ -1,7 +1,9 @@ package com.ruoyi.api.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; +import com.ruoyi.api.controller.BatchNoGenerator; import com.ruoyi.api.domain.*; import com.ruoyi.api.moveMsg.domain.MoveMsg; import com.ruoyi.api.moveMsg.service.IMoveMsgService; @@ -67,7 +69,8 @@ public class ToErpServiceImpl implements IToErpService { private IMydoJobService mydoJobService; @Autowired private IMydoJobDetailService mydoJobDetailService; - + @Autowired + private IBasJobIdService iBasJobIdService; @Autowired private IBasJobIdService basJobIdService; @@ -135,7 +138,7 @@ public class ToErpServiceImpl implements IToErpService { // 处理入库单相关操作（单据类型1-4） if (type >= 1 && type <= 4) { InStockin param = new InStockin(); - param.setStockinId(deliveryNoticeVo.getBillNo()); + param.setErpBill(deliveryNoticeVo.getBillNo()); List existList = inStockinService.selectInStockinListApi(param); InStockin exist = (existList != null && !existList.isEmpty()) ? existList.get(0) : null; @@ -170,7 +173,9 @@ public class ToErpServiceImpl implements IToErpService { if (exist == null) { inStockin.setStockinGuid(UUID.randomUUID().toString()); } - inStockin.setStockinId(deliveryNoticeVo.getBillNo()); + String rkdId = iBasJobIdService.getJobId("RKD"); + + inStockin.setStockinId(rkdId); inStockin.setInType(deliveryNoticeVo.getBillType()); inStockin.setCreateDate(deliveryNoticeVo.getBillDate()); inStockin.setCreateManId(deliveryNoticeVo.getCreateMan()); @@ -196,21 +201,28 @@ public class ToErpServiceImpl implements IToErpService { } List items = deliveryNoticeVo.getDetailList(); - + int a = 0; for (DeliveryNoticeItemVo item : items) { + a += 1; InStockinDetail detail = new InStockinDetail(); detail.setStockinGuid(inStockin.getStockinGuid()); - detail.setStockinDetailId(item.getLineNo()); + detail.setStockinDetailId(item.getBarCode()); detail.setStockinId(inStockin.getStockinId()); detail.setProductId(item.getInventoryCode()); detail.setProductName(item.getInventoryName()); detail.setSpec(item.getSpecModel()); detail.setUnit(item.getUnit()); detail.setQuantity(item.getQuantity()); - detail.setLotNo(item.getLotNo()); + if (item.getIsBatchManage().equals("1") && (item.getLotNo().equals("") || item.getLotNo() == null)) { + // 获取流水号 + detail.setLotNo(BatchNoGenerator.generateBatchNo()); + }else { + detail.setLotNo(item.getLotNo()); + } detail.setSpare1(item.getLevelRelation()); detail.setSpare2(item.getUpperMaterial()); detail.setSpare3(item.getTopMaterial()); + detail.setSpare4(item.getProjectNo()); detail.setSpare6(item.getLineNo()); detail.setRemark(item.getRemark()); detail.setAssignNum("0"); @@ -229,7 +241,7 @@ public class ToErpServiceImpl implements IToErpService { // 处理出库单相关操作（单据类型5-7） else if (type >= 5 && type <= 7) { OutStockout param = new OutStockout(); - param.setStockoutId(deliveryNoticeVo.getBillNo()); + param.setErpStockoutId(deliveryNoticeVo.getBillNo()); List outList = outStockoutService.selectOutStockoutList(param); OutStockout exist = (outList != null && !outList.isEmpty()) ? outList.get(0) : null; @@ -268,7 +280,8 @@ public class ToErpServiceImpl implements IToErpService { if (exist == null) { out.setStockoutGuid(UUID.randomUUID().toString()); } - out.setStockoutId(deliveryNoticeVo.getBillNo()); + String ckdId = iBasJobIdService.getJobId("CKD"); + out.setStockoutId(ckdId); out.setOutType(deliveryNoticeVo.getBillType()); out.setCreateDate(deliveryNoticeVo.getBillDate()); out.setErpStockoutId(deliveryNoticeVo.getBillNo()); @@ -276,7 +289,8 @@ public class ToErpServiceImpl implements IToErpService { out.setStatus("2"); out.setWarehouseId(deliveryNoticeVo.getWarehouseId()); out.setStockoutSource("1"); - out.setSpare6(deliveryNoticeVo.getOutType()); +// out.setSpare6(deliveryNoticeVo.getOutType()); + out.setSpare6("1"); out.setCarNumber(deliveryNoticeVo.getIsProjectOut()); out.setDepartmentNo(deliveryNoticeVo.getProjectNo()); out.setCustomerNo(deliveryNoticeVo.getCustomerId()); @@ -287,6 +301,8 @@ public class ToErpServiceImpl implements IToErpService { out.setSpare4(deliveryNoticeVo.getApproveMan());//审核人 out.setSpare5(deliveryNoticeVo.getRemark()); out.setSpare7(deliveryNoticeVo.getDestination()); + //手动设置出库类型为2 这样会赋值 in_or_out 21 + out.setSpare8("2"); out.setCompanyShortName(deliveryNoticeVo.getCompanyShortName()); out.setAccountSetNo(deliveryNoticeVo.getAccountSetNo()); @@ -302,11 +318,11 @@ public class ToErpServiceImpl implements IToErpService { outStockoutDetailService.deleteOutStockoutDetailByStockoutDetailIds(ids); } } - + int i = 0; for (DeliveryNoticeItemVo item : deliveryNoticeVo.getDetailList()) { OutStockoutDetail d = new OutStockoutDetail(); - - d.setStockoutDetailId(item.getLineNo()); + i += 1; + d.setStockoutDetailId(out.getStockoutId() + "-" + i); d.setStockoutGuid(out.getStockoutGuid()); d.setStockoutId(out.getStockoutId()); d.setProductId(item.getInventoryCode()); @@ -317,7 +333,7 @@ public class ToErpServiceImpl implements IToErpService { d.setSpare1(item.getLevelRelation()); d.setSpare2(item.getUpperMaterial()); d.setSpare3(item.getTopMaterial()); - d.setSpare4(deliveryNoticeVo.getProjectNo()); + d.setSpare4(item.getProjectNo()); d.setSpare6(item.getLineNo()); d.setRemark(item.getRemark()); d.setSourceLineId(item.getSourceLineId()); @@ -344,9 +360,9 @@ public class ToErpServiceImpl implements IToErpService { } - @Override public void callbackInDeliveryNotice() { + InStockinBack inStockin = inStockinBackService.selectTopInStockin(); if (inStockin == null) { return; @@ -357,12 +373,16 @@ public class ToErpServiceImpl implements IToErpService { deliveryNoticeVo.setBillType(inStockin.getInType()); deliveryNoticeVo.setOpType("1"); deliveryNoticeVo.setBillDate(inStockin.getCreateDate()); +// deliveryNoticeVo.setCreateMan(inStockin.getCreateManId()); deliveryNoticeVo.setWarehouseId(inStockin.getWarehouseId()); deliveryNoticeVo.setProjectNo(inStockin.getDepartmentNo()); deliveryNoticeVo.setCustomerId(inStockin.getSupplierNo()); deliveryNoticeVo.setCustomerName(inStockin.getClassNo()); // 对应receiveDeliveryNotice中的映射 deliveryNoticeVo.setContractNo(inStockin.getSpare1()); - +// deliveryNoticeVo.setSalesOrderNo(inStockin.getSpare2()); +// deliveryNoticeVo.setApproveDate(inStockin.getSpare3()); +// deliveryNoticeVo.setApproveMan(inStockin.getSpare4()); +// deliveryNoticeVo.setRemark(inStockin.getSpare5()); InStockinDetailBack inStockinDetailParam = new InStockinDetailBack(); inStockinDetailParam.setStockinId(inStockin.getStockinId()); @@ -485,7 +505,10 @@ public class ToErpServiceImpl implements IToErpService { String[] splitArea = detail.getSpare9().split(","); String[] splitLocation = detail.getSpare8().split(","); String[] splitQuantity = detail.getQuantityX().split(","); - String[] lotNo = detail.getLotNo().split(","); + String[] lotNo = new String[]{}; + if (StrUtil.isNotEmpty(detail.getLotNo())) { + lotNo = detail.getLotNo().split(","); + } ArrayList locationDetails = new ArrayList<>(); for (int i = 0; i < splitArea.length; i++) { LocationDetail locationDetail = new LocationDetail(); @@ -657,14 +680,14 @@ public class ToErpServiceImpl implements IToErpService { } CallBackErp callBackErp = new CallBackErp(); callBackErp.setCcompany(inStockin.getCompanyShortName()); // 公司简称 - callBackErp.setCcode(inStockin.getStockinId()); // wms 单据号 - callBackErp.setDdate(inStockin.getFinishDate()); // 操作日期 + callBackErp.setCcode(inStockin.getStockinId()); // wms 单据号 需要改成作业号 + callBackErp.setDdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); // 操作日期 callBackErp.setCintype(inStockin.getInType()); // 业务类型 callBackErp.setCvencode(inStockin.getSupplierNo()); // 供应商编码 - callBackErp.setCvenname(inStockin.getSupplierNo()); // 供应商名称 + callBackErp.setCvenname(inStockin.getClassNo()); // 供应商名称 callBackErp.setCoptname(inStockin.getCreateManId()); // 操作人 callBackErp.setCmemo(inStockin.getRemark()); // 备注 - callBackErp.setCaccId(inStockin.getAccountSetNo()); // 账套号 + callBackErp.setCacc_id(inStockin.getAccountSetNo()); // 账套号 callBackErp.setCwhcode("01"); // 仓库编码 callBackErp.setCwhname("立体库"); // 仓库名称 @@ -679,23 +702,24 @@ public class ToErpServiceImpl implements IToErpService { if (inStockinDetails != null && !inStockinDetails.isEmpty()) { for (InStockinDetailBack detail : inStockinDetails) { CallBackErpItems item = new CallBackErpItems(); - // 存货编码 + // 存货编码11 item.setCinvcode(detail.getProductId()); // 存货名称 item.setCinvname(detail.getProductName()); // 规格型号 item.setCinvstd(detail.getSpec()); // 单位 - item.setCinvmUnit(detail.getUnit()); + item.setCinvm_unit(detail.getUnit()); // 货位编码 item.setCposcode(detail.getSpare9()); // 货位名称 item.setCposname(""); // 托盘号 item.setCtrayname(detail.getSpare8()); + //jobid + item.setJobid(detail.getSpare7()); // 批号 item.setCbatch(detail.getLotNo()); -// item.setLotNo(detail.getLotNo()); // 数量 item.setIquantity(Integer.valueOf(detail.getAssignNum())); // 老项目号 @@ -718,9 +742,11 @@ public class ToErpServiceImpl implements IToErpService { callBackErp.setDetails(detailList); String sendMsg = JSONUtil.toJsonStr(callBackErp); + System.err.println(sendMsg); try { //todo 发送给erp 成功失败改状态 - RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.235/app1/api?type=1&key=1", JSONUtil.toJsonStr(callBackErp), "入库回传", "wms", "erp", inStockin.getInType(), inStockin.getAccountSetNo()); + // http://192.168.188.235/app1/api?type=1&key=1 + RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.239:1093/hzgmid/ServerCommand/SaveDataFromWms", JSONUtil.toJsonStr(callBackErp), "入库回传", "wms", "erp", inStockin.getInType(), inStockin.getAccountSetNo()); if ("1".equals(requestLog.getIsSuccessful())) { inStockin.setSendStatus("1"); inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); @@ -737,11 +763,12 @@ public class ToErpServiceImpl implements IToErpService { inStockinDetailParam.setSendStatus("2"); inStockinDetailParam.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); inStockinDetailParam.setMsg(requestLog.getErrorDetails()); +// inStockinDetailBackService.insertInStockInDetailBackFinish(inStockinDetails); +// inStockinDetailBackService.deleteInStockInDetailList(inStockinDetails); } inStockinBackService.updateInStockinBack(inStockin); inStockinDetailBackService.updateInStockinDetailBack(inStockinDetailParam); - } catch (Exception e) { inStockin.setSendStatus("2"); inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); @@ -755,11 +782,6 @@ public class ToErpServiceImpl implements IToErpService { } - public static void main(String[] args) { - System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - } - - @Override public void callbackDeliveryOutNoticeNew() { OutStockoutBack outStockoutBack = outStockoutBackService.selelctTopOutStockout(); @@ -769,13 +791,13 @@ public class ToErpServiceImpl implements IToErpService { CallBackErp callBackErp = new CallBackErp(); callBackErp.setCcompany(outStockoutBack.getCompanyShortName()); // 公司简称 callBackErp.setCcode(outStockoutBack.getStockoutId()); // wms 单据号 - callBackErp.setDdate(outStockoutBack.getFinishDate()); // 操作日期 - callBackErp.setCintype("1"); // 业务类型 + callBackErp.setDdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); // 操作日期 + callBackErp.setCintype(outStockoutBack.getOutType()); // 业务类型 callBackErp.setCvencode(outStockoutBack.getCustomerNo()); // 供应商编码 callBackErp.setCvenname(outStockoutBack.getCustomerNo()); // 供应商名称 callBackErp.setCoptname(outStockoutBack.getCreateManId()); // 操作人 callBackErp.setCmemo(outStockoutBack.getRemark()); // 备注 - callBackErp.setCaccId(outStockoutBack.getAccountSetNo()); // 账套号 + callBackErp.setCacc_id(outStockoutBack.getAccountSetNo()); // 账套号 callBackErp.setCwhcode("01"); // 仓库编码 callBackErp.setCwhname("立体库"); // 仓库名称 @@ -796,7 +818,7 @@ public class ToErpServiceImpl implements IToErpService { // 规格型号 item.setCinvstd(detail.getSpec()); // 单位 - item.setCinvmUnit(detail.getUnit()); + item.setCinvm_unit(detail.getUnit()); // 货位编码 item.setCposcode(detail.getSpare9()); // 货位名称 @@ -805,6 +827,8 @@ public class ToErpServiceImpl implements IToErpService { item.setCtrayname(detail.getSpare8()); // 批号 item.setCbatch(detail.getLotNo()); + + item.setJobid(detail.getSpare7()); // item.setLotNo(detail.getLotNo()); // 数量 item.setIquantity(Integer.parseInt(String.valueOf(detail.getAssignNum()))); @@ -824,12 +848,13 @@ public class ToErpServiceImpl implements IToErpService { detailList.add(item); } + callBackErp.setDetails(detailList); } try { //todo 发送给erp 成功失败改状态 - RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.235/app1/api?type=1&key=1", JSONUtil.toJsonStr(callBackErp), "出库回传", "wms", "erp"); + RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.239:1093/hzgmid/ServerCommand/SaveDataFromWms", JSONUtil.toJsonStr(callBackErp), "出库回传", "wms", "erp", outStockoutBack.getOutType(), outStockoutBack.getAccountSetNo()); if ("1".equals(requestLog.getIsSuccessful())) { outStockoutBack.setSendStatus("1"); outStockoutBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); @@ -837,6 +862,8 @@ public class ToErpServiceImpl implements IToErpService { outStockoutDetailBack.setSendStatus("1"); outStockoutDetailBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); outStockoutDetailBack.setMsg("成功"); + outStockoutDetailBackService.insertOutStockDetailBackFinish(outStockoutDetailBacks); + outStockoutDetailBackService.deleteOutStockDetailList(outStockoutDetailBacks); } else { outStockoutBack.setSendStatus("2"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java index e203c61..0c5e949 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java @@ -42,7 +42,6 @@ public class ToWcsServiceImpl implements IToWcsService { public static final String UPDATE_WCS_PORT = "http://localhost:8081/wcs2Wms/api/updateWcsPort"; - @Override @Scheduled(fixedDelay=1500) public void pushOutMydoJob() { @@ -153,18 +152,4 @@ public class ToWcsServiceImpl implements IToWcsService { return AjaxResult.error(); } - - @Override - public AjaxResult insertAgvMoveJob(AgvMoveParam agvMoveParam) { - Map map = new HashMap<>(); - map.put("startPoint", agvMoveParam.getStartPoint()); - map.put("endPoint", agvMoveParam.getEndPoint()); - map.put("type", agvMoveParam.getType()); - map.put("jobId", UUID.randomUUID().toString()); - RequestLog requestLog = requestLogService.getRequestLog(PUSH_AGV_MOVE_JOB, JSONUtil.toJsonStr(map), "修改缓存点状态","wms","wcs"); - if ("1".equals(requestLog.getIsSuccessful())){ - return AjaxResult.success(); - } - return AjaxResult.error(); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/TwinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/TwinServiceImpl.java index 13e6dfc..467a480 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/TwinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/TwinServiceImpl.java @@ -262,7 +262,7 @@ public class TwinServiceImpl implements ITwinService { @Override public Map getCargo(String cargoSpaceName) { BasStock basStock = new BasStock(); - basStock.setCargoSpaceName(cargoSpaceName); + basStock.setCargoSpaceId(cargoSpaceName); List list = basStockService.selectBasStockList(basStock); List> dataList = new ArrayList<>(); for (BasStock stock : list) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java index b8f87ca..9b67a92 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java @@ -27,23 +27,25 @@ import java.util.List; */ @RestController @RequestMapping("/check/stockCheck") -public class CheckStockinController extends BaseController { +public class CheckStockinController extends BaseController +{ @Autowired private ICheckStockinService checkStockinService; @Autowired - private ICheckStockinFinishService checkStockinFinishService; + private ICheckStockinFinishService checkStockinFinishService; /** * 查询盘库单据主信息列表 */ @PreAuthorize("@ss.hasPermi('check:stockCheck:list')") @GetMapping("/list") - public TableDataInfo list(CheckStockin checkStockin) { + public TableDataInfo list(CheckStockin checkStockin) + { startPage(); List list = new ArrayList<>(); - if (checkStockin.getStatus() == null || Convert.toInt(checkStockin.getStatus()) < 4) { - list = checkStockinService.selectCheckStockinList(checkStockin); - } else { + if (checkStockin.getStatus() == null || Convert.toInt(checkStockin.getStatus())<4){ + list = checkStockinService.selectCheckStockinList(checkStockin); + }else { list = checkStockinFinishService.selectCheckStockinList(checkStockin); } @@ -56,7 +58,8 @@ public class CheckStockinController extends BaseController { @PreAuthorize("@ss.hasPermi('check:stockCheck:export')") @Log(title = "盘库单据主信息", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, CheckStockin checkStockin) { + public void export(HttpServletResponse response, CheckStockin checkStockin) + { List list = checkStockinService.selectCheckStockinList(checkStockin); ExcelUtil util = new ExcelUtil(CheckStockin.class); util.exportExcel(response, list, "盘库单据主信息数据"); @@ -67,7 +70,8 @@ public class CheckStockinController extends BaseController { */ @PreAuthorize("@ss.hasPermi('check:stockCheck:query')") @GetMapping(value = "/{stockGuid}") - public AjaxResult getInfo(@PathVariable("stockGuid") String stockGuid) { + public AjaxResult getInfo(@PathVariable("stockGuid") String stockGuid) + { return success(checkStockinService.selectCheckStockinByStockGuid(stockGuid)); } @@ -77,7 +81,8 @@ public class CheckStockinController extends BaseController { @PreAuthorize("@ss.hasPermi('check:stockCheck:add')") @Log(title = "盘库单据主信息", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody CheckStockin checkStockin) { + public AjaxResult add(@RequestBody CheckStockin checkStockin) + { return toAjax(checkStockinService.insertCheckStockin(checkStockin)); } @@ -87,7 +92,8 @@ public class CheckStockinController extends BaseController { @PreAuthorize("@ss.hasPermi('check:stockCheck:edit')") @Log(title = "盘库单据主信息", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody CheckStockin checkStockin) { + public AjaxResult edit(@RequestBody CheckStockin checkStockin) + { return checkStockinService.updateCheckStockin(checkStockin); } @@ -96,8 +102,9 @@ public class CheckStockinController extends BaseController { */ @PreAuthorize("@ss.hasPermi('check:stockCheck:remove')") @Log(title = "盘库单据主信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{stockGuids}") - public AjaxResult remove(@PathVariable String[] stockGuids) { + @DeleteMapping("/{stockGuids}") + public AjaxResult remove(@PathVariable String[] stockGuids) + { return toAjax(checkStockinService.deleteCheckStockinByStockGuids(stockGuids)); } @@ -112,15 +119,12 @@ public class CheckStockinController extends BaseController { @PreAuthorize("@ss.hasPermi('check:stockCheck:saveBill')") @ResponseBody public AjaxResult saveBill(@RequestBody CheckStockVo checkStockVo) { - return checkStockinService.saveBill(checkStockVo); - - - + String stockOutId = checkStockinService.saveBill(checkStockVo); + return AjaxResult.success(stockOutId); } /** * 盘点自动分配 - * * @param checkStockin * @return */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/ICheckStockinService.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/ICheckStockinService.java index 6eb6d90..536a042 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/ICheckStockinService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/ICheckStockinService.java @@ -62,7 +62,7 @@ public interface ICheckStockinService */ public int deleteCheckStockinByStockGuid(String stockGuid); - AjaxResult saveBill(CheckStockVo outStockoutVo); + String saveBill(CheckStockVo outStockoutVo); /** * 盘点自动分配 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java index 0c7d498..8aca668 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java @@ -162,8 +162,9 @@ public class CheckStockinServiceImpl implements ICheckStockinService { @Override @Transactional(rollbackFor = Exception.class) - public AjaxResult saveBill(CheckStockVo checkStockVo) { + public String saveBill(CheckStockVo checkStockVo) { CheckStockin checkStockin = checkStockVo.getCheckStockin(); + List detailList = checkStockVo.getDetailList(); String stockCheckId = basJobIdService.getJobId("PDD"); checkStockin.setStockCheckId(stockCheckId); @@ -182,9 +183,6 @@ public class CheckStockinServiceImpl implements ICheckStockinService { checkStockinDetail.setStockCheckDetailId(stockCheckId + "-" + (i + 1)); checkStockinDetail.setStockCheckId(stockCheckId); BasProduct basProduct = productService.selectBasProductByProductId(checkStockinDetail.getProductId()); - if (basProduct==null){ - throw new RuntimeException(checkStockinDetail.getProductId()+",系统内无该物料，请检查！"); - } checkStockinDetail.setProductGuid(basProduct.getProductGuid()); checkStockinDetail.setStockCheckGuid(checkStockin.getStockGuid()); checkStockinDetail.setScanNum("0"); @@ -195,6 +193,13 @@ public class CheckStockinServiceImpl implements ICheckStockinService { } else if ("2".equals(checkStockin.getCheckType())) { //货位盘点 for (int i = 0; i < detailList.size(); i++) { +// BasStock param = new BasStock(); +// param.setCargoSpaceId(detailList.get(i).getSpare1()); +// List basStocks = basStockService.selectBasStockList(param); +// Integer quantity = 0; +// for (BasStock basStock : basStocks) { +// quantity += Convert.toInt(basStock.getQuantity()); +// } CheckStockinDetail checkStockinDetail = detailList.get(i); checkStockinDetail.setStockCheckDetailId(stockCheckId + "-" + (i + 1)); checkStockinDetail.setStockCheckId(stockCheckId); @@ -206,7 +211,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService { } checkStockinMapper.insertCheckStockin(checkStockin); - return AjaxResult.success("单据创建成功",stockCheckId); + return stockCheckId; } @Override diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java index 20cfd5f..2d84e9e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java @@ -13,127 +13,90 @@ import java.util.List; * @author ruoyi * @date 2025-05-20 */ -public class InStockin extends BaseEntity { +public class InStockin extends BaseEntity +{ private static final long serialVersionUID = 1L; - /** - * GUID - */ + /** GUID */ private String stockinGuid; - /** - * 入库订单ID - */ + /** 入库订单ID */ @Excel(name = "入库订单ID") private String stockinId; - /** - * 入库类型 - */ + /** 入库类型 */ @Excel(name = "入库类型") private String inType; - /** - * 建立时间 - */ + /** 建立时间 */ @Excel(name = "建立时间") private String createDate; - /** - * 创建人 - */ + /** 创建人 */ private String createManId; @Excel(name = "创建人") private String createManName; - /** - * 单据状态 - */ + /** 单据状态 */ @Excel(name = "单据状态") private String status; - /** - * 仓库ID - */ + /** 仓库ID */ @Excel(name = "仓库ID") private String warehouseId; @Excel(name = "仓库") private String warehouseName; - /** - * 完成日期 - */ + /** 完成日期 */ @Excel(name = " 完成日期") private String finishDate; - /** - * erp单号 - */ + /** erp单号 */ @Excel(name = "erp单号") private String erpBill; - /** - * 单据来源 - */ + /** 单据来源 */ @Excel(name = "单据来源") private String stockSource; - /** - * 部门编码 - */ + /** 部门编码 */ @Excel(name = "部门编码") private String departmentNo; @Excel(name = "部门") private String departmentName; - /** - * 客户编码 - */ + /** 客户编码 */ @Excel(name = "客户编码") private String customerNo; - /** - * 班组编码 - */ + /** 班组编码 */ @Excel(name = "班组编码") private String classNo; - /** - * 供应商编码 - */ + /** 供应商编码 */ @Excel(name = "供应商编码") private String supplierNo; @Excel(name = "供应商") private String supplierName; - /** - * 备用字段1 - */ + /** 备用字段1 */ @Excel(name = "备用字段1") private String spare1; - /** - * 备用字段2 - */ + /** 备用字段2 */ @Excel(name = "备用字段2") private String spare2; - /** - * 备用字段4 - */ + /** 备用字段4 */ @Excel(name = "备用字段4") private String spare4; - /** - * 备用字段3 - */ + /** 备用字段3 */ @Excel(name = "备用字段3") private String spare3; - /** - * 备用字段5 - */ + /** 备用字段5 */ @Excel(name = "备用字段5") private String spare5; @@ -144,6 +107,13 @@ public class InStockin extends BaseEntity { private String companyShortName; private String accountSetNo; + public String getCompanyShortName() { + return companyShortName; + } + + public void setCompanyShortName(String companyShortName) { + this.companyShortName = companyShortName; + } public String getAccountSetNo() { return accountSetNo; @@ -153,14 +123,6 @@ public class InStockin extends BaseEntity { this.accountSetNo = accountSetNo; } - public String getCompanyShortName() { - return companyShortName; - } - - public void setCompanyShortName(String companyShortName) { - this.companyShortName = companyShortName; - } - private List typeData; public String getStartDate() { @@ -227,155 +189,193 @@ public class InStockin extends BaseEntity { this.supplierName = supplierName; } - public void setStockinGuid(String stockinGuid) { + public void setStockinGuid(String stockinGuid) + { this.stockinGuid = stockinGuid; } - public String getStockinGuid() { + public String getStockinGuid() + { return stockinGuid; } - public void setStockinId(String stockinId) { + public void setStockinId(String stockinId) + { this.stockinId = stockinId; } - public String getStockinId() { + public String getStockinId() + { return stockinId; } - public void setInType(String inType) { + public void setInType(String inType) + { this.inType = inType; } - public String getInType() { + public String getInType() + { return inType; } - public void setCreateDate(String createDate) { + public void setCreateDate(String createDate) + { this.createDate = createDate; } - public String getCreateDate() { + public String getCreateDate() + { return createDate; } - public void setCreateManId(String createManId) { + public void setCreateManId(String createManId) + { this.createManId = createManId; } - public String getCreateManId() { + public String getCreateManId() + { return createManId; } - public void setStatus(String status) { + public void setStatus(String status) + { this.status = status; } - public String getStatus() { + public String getStatus() + { return status; } - public void setWarehouseId(String warehouseId) { + public void setWarehouseId(String warehouseId) + { this.warehouseId = warehouseId; } - public String getWarehouseId() { + public String getWarehouseId() + { return warehouseId; } - public void setFinishDate(String finishDate) { + public void setFinishDate(String finishDate) + { this.finishDate = finishDate; } - public String getFinishDate() { + public String getFinishDate() + { return finishDate; } - public void setErpBill(String erpBill) { + public void setErpBill(String erpBill) + { this.erpBill = erpBill; } - public String getErpBill() { + public String getErpBill() + { return erpBill; } - public void setStockSource(String stockSource) { + public void setStockSource(String stockSource) + { this.stockSource = stockSource; } - public String getStockSource() { + public String getStockSource() + { return stockSource; } - public void setDepartmentNo(String departmentNo) { + public void setDepartmentNo(String departmentNo) + { this.departmentNo = departmentNo; } - public String getDepartmentNo() { + public String getDepartmentNo() + { return departmentNo; } - public void setCustomerNo(String customerNo) { + public void setCustomerNo(String customerNo) + { this.customerNo = customerNo; } - public String getCustomerNo() { + public String getCustomerNo() + { return customerNo; } - public void setClassNo(String classNo) { + public void setClassNo(String classNo) + { this.classNo = classNo; } - public String getClassNo() { + public String getClassNo() + { return classNo; } - public void setSupplierNo(String supplierNo) { + public void setSupplierNo(String supplierNo) + { this.supplierNo = supplierNo; } - public String getSupplierNo() { + public String getSupplierNo() + { return supplierNo; } - public void setSpare1(String spare1) { + public void setSpare1(String spare1) + { this.spare1 = spare1; } - public String getSpare1() { + public String getSpare1() + { return spare1; } - public void setSpare2(String spare2) { + public void setSpare2(String spare2) + { this.spare2 = spare2; } - public String getSpare2() { + public String getSpare2() + { return spare2; } - public void setSpare4(String spare4) { + public void setSpare4(String spare4) + { this.spare4 = spare4; } - public String getSpare4() { + public String getSpare4() + { return spare4; } - public void setSpare3(String spare3) { + public void setSpare3(String spare3) + { this.spare3 = spare3; } - public String getSpare3() { + public String getSpare3() + { return spare3; } - public void setSpare5(String spare5) { + public void setSpare5(String spare5) + { this.spare5 = spare5; } - public String getSpare5() { + public String getSpare5() + { return spare5; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/domain/InStockinBack.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/domain/InStockinBack.java index 059ff84..e739fe0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/domain/InStockinBack.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/domain/InStockinBack.java @@ -95,17 +95,8 @@ public class InStockinBack extends BaseEntity private String sendTime; private String msg; - - private String accountSetNo; private String companyShortName; - - public String getAccountSetNo() { - return accountSetNo; - } - - public void setAccountSetNo(String accountSetNo) { - this.accountSetNo = accountSetNo; - } + private String accountSetNo; public String getCompanyShortName() { return companyShortName; @@ -115,6 +106,14 @@ public class InStockinBack extends BaseEntity this.companyShortName = companyShortName; } + public String getAccountSetNo() { + return accountSetNo; + } + + public void setAccountSetNo(String accountSetNo) { + this.accountSetNo = accountSetNo; + } + public String getSendStatus() { return sendStatus; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/domain/InStockinDetailBack.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/domain/InStockinDetailBack.java index 59616dd..233d1f3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/domain/InStockinDetailBack.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/domain/InStockinDetailBack.java @@ -152,12 +152,12 @@ public class InStockinDetailBack extends BaseEntity private String msg; + private String sourceLineId; private String barCode; private String isBatchManage; private String oldProjectNo; - public String getSourceLineId() { return sourceLineId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/mapper/InStockinDetailBackMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/mapper/InStockinDetailBackMapper.java index 181c707..9ddc0ac 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/mapper/InStockinDetailBackMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/mapper/InStockinDetailBackMapper.java @@ -8,14 +8,15 @@ import org.apache.ibatis.annotations.Param; /** * 入库单据子信息Mapper接口 - * + * * @author ruoyi * @date 2026-01-27 */ -public interface InStockinDetailBackMapper { +public interface InStockinDetailBackMapper +{ /** * 查询入库单据子信息 - * + * * @param stockinDetailId 入库单据子信息主键 * @return 入库单据子信息 */ @@ -23,7 +24,7 @@ public interface InStockinDetailBackMapper { /** * 查询入库单据子信息列表 - * + * * @param inStockinDetailBack 入库单据子信息 * @return 入库单据子信息集合 */ @@ -31,17 +32,16 @@ public interface InStockinDetailBackMapper { /** * 新增入库单据子信息 - * + * * @param inStockinDetailBack 入库单据子信息 * @return 结果 */ public int insertInStockinDetailBack(InStockinDetailBack inStockinDetailBack); - public int insertInStockinDetailBackById(InStockin inStockin); /** * 修改入库单据子信息 - * + * * @param inStockinDetailBack 入库单据子信息 * @return 结果 */ @@ -49,7 +49,7 @@ public interface InStockinDetailBackMapper { /** * 删除入库单据子信息 - * + * * @param stockinDetailId 入库单据子信息主键 * @return 结果 */ @@ -57,7 +57,7 @@ public interface InStockinDetailBackMapper { /** * 批量删除入库单据子信息 - * + * * @param stockinDetailIds 需要删除的数据主键集合 * @return 结果 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/IInStockinDetailBackService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/IInStockinDetailBackService.java index 84f7b2f..9b1b1fb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/IInStockinDetailBackService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/IInStockinDetailBackService.java @@ -59,7 +59,7 @@ public interface IInStockinDetailBackService */ public int deleteInStockinDetailBackByStockinDetailId(String stockinDetailId); - void insertInStockInDetailBackFinish(List inStockinDetailParam); + void insertInStockInDetailBackFinish(List inStockinDetails); void deleteInStockInDetailList(List inStockinDetails); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/impl/InStockinDetailBackServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/impl/InStockinDetailBackServiceImpl.java index 3e166a1..9ec707c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/impl/InStockinDetailBackServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/service/impl/InStockinDetailBackServiceImpl.java @@ -92,8 +92,8 @@ public class InStockinDetailBackServiceImpl implements IInStockinDetailBackServi } @Override - public void insertInStockInDetailBackFinish(List inStockinDetailParam) { - inStockinDetailBackMapper.insertInStockInDetailBackFinish(inStockinDetailParam); + public void insertInStockInDetailBackFinish(List inStockinDetails) { + inStockinDetailBackMapper.insertInStockInDetailBackFinish(inStockinDetails); } @Override diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java index 2a42910..bb7fdad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java @@ -18,73 +18,52 @@ import lombok.ToString; @AllArgsConstructor @NoArgsConstructor @ToString -public class InStockinDetail extends BaseEntity { +public class InStockinDetail extends BaseEntity +{ private static final long serialVersionUID = 1L; - /** - * 子单ID - */ + /** 子单ID */ private String stockinDetailId; - /** - * 主单GUID - */ + /** 主单GUID */ @Excel(name = "主单GUID") private String stockinGuid; - /** - * 主单ID - */ + /** 主单ID */ @Excel(name = "主单ID") private String stockinId; - /** - * 批次号 - */ + /** 批次号 */ @Excel(name = "批次号") private String lotNo; - /** - * 物料ID - */ + /** 物料ID */ @Excel(name = "物料ID") private String productGuid; - /** - * 品号 - */ + /** 品号 */ @Excel(name = "品号") private String productId; @Excel(name = "品名") private String productName; - /** - * 计划数量 - */ + /** 计划数量 */ @Excel(name = "计划数量") private String quantity; - /** - * 计划数量(箱) - */ + /** 计划数量(箱) */ @Excel(name = "计划数量(箱)") private String quantityX; - /** - * 计划数量(件) - */ + /** 计划数量(件) */ @Excel(name = "计划数量(件)") private String quantityJ; - /** - * 参考单价 - */ + /** 参考单价 */ @Excel(name = "参考单价") private String price; - /** - * 品牌 - */ + /** 品牌 */ @Excel(name = "品牌") private String cargoNo; @@ -95,93 +74,63 @@ public class InStockinDetail extends BaseEntity { @Excel(name = "扫码数量(件)") private String scanNumJ; - /** - * 实际数量 - */ + /** 实际数量 */ @Excel(name = "实际数量") private String assignNum; - /** - * 实际数量(箱) - */ + /** 实际数量(箱) */ @Excel(name = "实际数量(箱)") private String assignNumX; - /** - * 实际数量(件) - */ + /** 实际数量(件) */ @Excel(name = "实际数量(件)") private String assignNumJ; - /** - * 入库日期 - */ + /** 入库日期 */ @Excel(name = "入库日期") private String printDate; - /** - * 单据状态 - */ + /** 单据状态 */ @Excel(name = "单据状态") private String stockStatus; - /** - * 供应商编码 - */ + /** 供应商编码 */ @Excel(name = "供应商编码") private String supplierId; - /** - * 客户编码 - */ + /** 客户编码 */ @Excel(name = "客户编码") private String customerId; - /** - * 单位 - */ + /** 单位 */ @Excel(name = "单位") private String unit; - /** - * 规格 - */ + /** 规格 */ @Excel(name = "规格") private String spec; - /** - * 备用字段1 - */ + /** 备用字段1 */ @Excel(name = "型号") private String spare1; - /** - * 备用字段2 - */ + /** 备用字段2 */ @Excel(name = "净重") private String spare2; - /** - * 备用字段3 - */ + /** 备用字段3 */ @Excel(name = "颜色") private String spare3; - /** - * 备用字段4 - */ + /** 备用字段4 */ @Excel(name = "序列号") private String spare4; - /** - * 备用字段5 - */ + /** 备用字段5 */ @Excel(name = "电压") private String spare5; - /** - * 备用字段6 - */ + /** 备用字段6 */ @Excel(name = "功率") private String spare6; @Excel(name = "相位") @@ -198,12 +147,8 @@ public class InStockinDetail extends BaseEntity { private String warehouseName; private String warehouseId; - private String sourceLineId; private String barCode; private String isBatchManage; private String oldProjectNo; - - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java index d8ccfd8..baa5ba4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java @@ -1,7 +1,6 @@ package com.ruoyi.in.stockindetail.mapper; import com.ruoyi.in.stockin.domain.InStockin; -import com.ruoyi.in.stockindeatilback.domain.InStockinDetailBack; import com.ruoyi.in.stockindetail.domain.InStockinDetail; import org.apache.ibatis.annotations.Param; @@ -70,5 +69,4 @@ public interface InStockinDetailMapper void deleteInStockinDetailByStockinGuid(String stockinGuid); InStockinDetail selectStockinByDetailById(InStockinDetail inStockinDetail); - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java index 18d8c0a..aef8ee6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java @@ -2,7 +2,6 @@ package com.ruoyi.in.stockindetail.service; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.in.stockin.domain.InStockin; -import com.ruoyi.in.stockindeatilback.domain.InStockinDetailBack; import com.ruoyi.in.stockindetail.domain.InStockinDetail; import java.util.List; @@ -82,6 +81,4 @@ public interface IInStockinDetailService public InStockinDetail selectStockinByDetailById(InStockinDetail inStockinDetail); - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java index 6aa268b..1763b66 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java @@ -3,7 +3,6 @@ package com.ruoyi.in.stockindetail.service.impl; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.in.stockin.domain.InStockin; -import com.ruoyi.in.stockindeatilback.domain.InStockinDetailBack; import com.ruoyi.in.stockindetail.domain.InStockinDetail; import com.ruoyi.in.stockindetail.mapper.InStockinDetailMapper; import com.ruoyi.in.stockindetail.service.IInStockinDetailService; @@ -128,6 +127,4 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService return inStockinDetailMapper.selectStockinByDetailById(inStockinDetail); } - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java b/ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java index e0dd993..01b3669 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java @@ -69,9 +69,7 @@ public interface IRequestLogService * @return */ public RequestLog getRequestLog(String url, String param, String remark,String source,String target); - public RequestLog getRequestLog(String url, String param, String remark,String source,String target,String billType,String ciccid); - /** * 接收接口记录 * @@ -80,4 +78,7 @@ public interface IRequestLogService * @return */ public RequestLog getRequestLog(String param, String remark, AjaxResult ajaxResult); + + public RequestLog getRequestLogERP(String param, String remark, AjaxResult ajaxResult); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java index 6b80ff3..92a27fb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java @@ -3,7 +3,10 @@ package com.ruoyi.log.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.net.URLDecoder; +import cn.hutool.core.net.URLEncodeUtil; import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.ruoyi.common.core.domain.AjaxResult; @@ -13,7 +16,7 @@ import com.ruoyi.log.service.IRequestLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - +import cn.hutool.core.net.URLEncoder; import java.util.Date; import java.util.List; @@ -25,7 +28,8 @@ import java.util.List; */ @Service @Slf4j -public class RequestLogServiceImpl implements IRequestLogService { +public class RequestLogServiceImpl implements IRequestLogService +{ @Autowired private RequestLogMapper requestLogMapper; @@ -36,7 +40,8 @@ public class RequestLogServiceImpl implements IRequestLogService { * @return 接口记录 */ @Override - public RequestLog selectRequestLogByRequestId(Long requestId) { + public RequestLog selectRequestLogByRequestId(Long requestId) + { return requestLogMapper.selectRequestLogByRequestId(requestId); } @@ -47,7 +52,8 @@ public class RequestLogServiceImpl implements IRequestLogService { * @return 接口记录 */ @Override - public List selectRequestLogList(RequestLog requestLog) { + public List selectRequestLogList(RequestLog requestLog) + { return requestLogMapper.selectRequestLogList(requestLog); } @@ -58,9 +64,10 @@ public class RequestLogServiceImpl implements IRequestLogService { * @return 结果 */ @Override - public int insertRequestLog(RequestLog requestLog) { + public int insertRequestLog(RequestLog requestLog) + { - return requestLogMapper.insertRequestLog(requestLog); + return requestLogMapper.insertRequestLog(requestLog); } @@ -71,7 +78,8 @@ public class RequestLogServiceImpl implements IRequestLogService { * @return 结果 */ @Override - public int updateRequestLog(RequestLog requestLog) { + public int updateRequestLog(RequestLog requestLog) + { return requestLogMapper.updateRequestLog(requestLog); } @@ -82,7 +90,8 @@ public class RequestLogServiceImpl implements IRequestLogService { * @return 结果 */ @Override - public int deleteRequestLogByRequestIds(Long[] requestIds) { + public int deleteRequestLogByRequestIds(Long[] requestIds) + { return requestLogMapper.deleteRequestLogByRequestIds(requestIds); } @@ -93,7 +102,8 @@ public class RequestLogServiceImpl implements IRequestLogService { * @return 结果 */ @Override - public int deleteRequestLogByRequestId(Long requestId) { + public int deleteRequestLogByRequestId(Long requestId) + { return requestLogMapper.deleteRequestLogByRequestId(requestId); } @@ -105,7 +115,7 @@ public class RequestLogServiceImpl implements IRequestLogService { * @return requestLog */ @Override - public RequestLog getRequestLog(String url, String param, String remark, String source, String target) { + public RequestLog getRequestLog(String url, String param, String remark,String source,String target) { RequestLog requestLog = new RequestLog(); requestLog.setRequestTime(DateUtil.formatDateTime(new Date())); requestLog.setSourceSystem(source); @@ -116,9 +126,9 @@ public class RequestLogServiceImpl implements IRequestLogService { requestLog.setRequestBody(param); requestLog.setRequestUrl(url); try { - String resStr = HttpRequest.post(url).form("datajson", param).form("ibilltype", "").form("cacc_id", "").contentType("application/x-www-from-urlencoded"). - timeout(2000).execute().body(); -// String resStr = HttpUtil.post(url, param); +// String resStr = HttpRequest.post(url).contentType("application/x-www-from-urlencoded").timeout(2000).body(param).execute().body(); + + String resStr = HttpUtil.post(url, param); requestLog.setResponseBody(resStr); // 判断resStr的状态码，如果不是200抛出异常让catch捕获 if (!JSONUtil.isJsonObj(resStr)) { @@ -143,9 +153,12 @@ public class RequestLogServiceImpl implements IRequestLogService { return requestLog; } - @Override public RequestLog getRequestLog(String url, String param, String remark, String source, String target, String billType, String ciccid) { + String body = "datajson=" + param + + "&ibilltype=" + URLEncodeUtil.encodeAll(billType) + + "&cacc_id=" + URLEncodeUtil.encodeAll(ciccid); + RequestLog requestLog = new RequestLog(); requestLog.setRequestTime(DateUtil.formatDateTime(new Date())); requestLog.setSourceSystem(source); @@ -153,20 +166,22 @@ public class RequestLogServiceImpl implements IRequestLogService { requestLog.setEndpoint(remark); requestLog.setRequestMethod("post"); requestLog.setRequestHeaders(null); - requestLog.setRequestBody("datajson:" + param + ",ibilltype:" + billType + ",cacc_id:" + ciccid); + requestLog.setRequestBody(body); requestLog.setRequestUrl(url); try { - String resStr = HttpRequest.post(url).form("datajson", param).form("ibilltype", billType).form("cacc_id", ciccid).contentType("application/x-www-from-urlencoded"). - timeout(2000).execute().body(); -// String resStr = HttpUtil.post(url, param); + String resStr = HttpRequest.post(url) + .contentType("application/x-www-form-urlencoded;charset=UTF-8") + .body(body) + .execute().body(); + requestLog.setResponseBody(resStr); // 判断resStr的状态码，如果不是200抛出异常让catch捕获 if (!JSONUtil.isJsonObj(resStr)) { throw new RuntimeException("返回结果不是有效的JSON对象"); } cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(resStr); - Object codeObj = jsonObject.get("code"); - if (codeObj == null || !codeObj.toString().equals("200")) { + Object codeObj = jsonObject.get("ErrCode"); + if (codeObj == null || !codeObj.toString().equals("0")) { throw new RuntimeException("请求失败，状态码: " + (codeObj != null ? codeObj.toString() : "null")); } requestLog.setResponseTime(DateUtil.formatDateTime(new Date())); @@ -184,13 +199,14 @@ public class RequestLogServiceImpl implements IRequestLogService { } + /** * 插入请求日志 * * @return requestLog */ @Override - public RequestLog getRequestLog(String param, String remark, AjaxResult ajaxResult) { + public RequestLog getRequestLog(String param, String remark,AjaxResult ajaxResult) { RequestLog requestLog = new RequestLog(); requestLog.setRequestTime(DateUtil.formatDateTime(new Date())); requestLog.setRequestBody(param); @@ -201,9 +217,30 @@ public class RequestLogServiceImpl implements IRequestLogService { requestLog.setResponseTime(DateUtil.formatDateTime(new Date())); requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS))); requestLog.setResponseStatus("1"); - if (ajaxResult.isSuccess()) { + if (ajaxResult.isSuccess()){ requestLog.setIsSuccessful("1"); - } else { + }else { + requestLog.setIsSuccessful("0"); + } + requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg"))); + return requestLog; + } + + @Override + public RequestLog getRequestLogERP(String param, String remark, AjaxResult ajaxResult) { + RequestLog requestLog = new RequestLog(); + requestLog.setRequestTime(DateUtil.formatDateTime(new Date())); + requestLog.setRequestBody(param); + requestLog.setSourceSystem("erp"); + requestLog.setTargetSystem("wms"); + requestLog.setEndpoint(remark); + requestLog.setRequestMethod("post"); + requestLog.setResponseTime(DateUtil.formatDateTime(new Date())); + requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS))); + requestLog.setResponseStatus("1"); + if (ajaxResult.isSuccess()){ + requestLog.setIsSuccessful("1"); + }else { requestLog.setIsSuccessful("0"); } requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg"))); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java index e438e28..f86ae4f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java @@ -134,8 +134,13 @@ public class OutStockoutController extends BaseController { */ @PreAuthorize("@ss.hasPermi('out:outStockout:autoAllot')") @Log(title = "出库单自动分配", businessType = BusinessType.OTHER) - @GetMapping("/autoAllot") - public AjaxResult autoAllot(@RequestParam("stockoutId") String stockoutId) { + @PostMapping("/autoAllot") + public AjaxResult autoAllot(@RequestParam("stockoutId") String stockoutId,@RequestParam("spare8") String spare8) { + // 修改出库方向 +// OutStockout outStockout = new OutStockout(); +// outStockout.setStockoutId(stockoutId); +// outStockout.setSpare8(spare8); +// outStockoutService.updateOutStockout(outStockout); return outStockoutService.autoAllot(stockoutId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java index 8d9eba7..ae75547 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java @@ -102,7 +102,6 @@ public class OutStockout extends BaseEntity private String productId; private String productName; - private String companyShortName; private String accountSetNo; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java index 8bc0e5e..862c0c7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java @@ -183,7 +183,6 @@ public class OutStockoutServiceImpl implements IOutStockoutService map.put("v_result", null); map.put("v_resultmsg", null); outStockoutMapper.autoAllot(map); - //toWcsService.pushOutMydoJob(); if (!"10".equals(map.get("v_result"))){ stringBuilder.append(",").append(detail.getStockoutDetailId()+map.get("v_resultmsg")); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/domain/OutStockoutBack.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/domain/OutStockoutBack.java index 68a9452..d8eca83 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/domain/OutStockoutBack.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/domain/OutStockoutBack.java @@ -127,6 +127,8 @@ public class OutStockoutBack extends BaseEntity @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String msg; + + private String companyShortName; private String accountSetNo; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java index 0905f7a..a67c485 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java @@ -48,7 +48,7 @@ public class OutStockoutDetail extends BaseEntity /** 计划数量（箱） */ @Excel(name = "计划数量", readConverterExp = "箱=") - private BigDecimal quantityX; + private String quantityX; /** 计划数量（件） */ @Excel(name = "计划数量", readConverterExp = "件=") @@ -199,20 +199,12 @@ public class OutStockoutDetail extends BaseEntity private String spare8; private String spare9; + private String sourceLineId; private String barCode; private String isBatchManage; - private String oldProjectNo; - public String getOldProjectNo() { - return oldProjectNo; - } - - public void setOldProjectNo(String oldProjectNo) { - this.oldProjectNo = oldProjectNo; - } - public String getSourceLineId() { return sourceLineId; } @@ -237,6 +229,14 @@ public class OutStockoutDetail extends BaseEntity this.isBatchManage = isBatchManage; } + public String getOldProjectNo() { + return oldProjectNo; + } + + public void setOldProjectNo(String oldProjectNo) { + this.oldProjectNo = oldProjectNo; + } + public String getSpare1() { return spare1; } @@ -443,14 +443,12 @@ public class OutStockoutDetail extends BaseEntity return quantity; } - public void setQuantityX(BigDecimal quantityX) - { - this.quantityX = quantityX; + public String getQuantityX() { + return quantityX; } - public BigDecimal getQuantityX() - { - return quantityX; + public void setQuantityX(String quantityX) { + this.quantityX = quantityX; } public void setQuantityJ(BigDecimal quantityJ) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/mapper/OutStockoutDetailBackMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/mapper/OutStockoutDetailBackMapper.java index 0337617..bbc7b1c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/mapper/OutStockoutDetailBackMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/mapper/OutStockoutDetailBackMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.out.outStockoutDetailBack.mapper; import java.util.List; import com.ruoyi.out.outStockoutDetailBack.domain.OutStockoutDetailBack; +import org.apache.ibatis.annotations.Param; /** * 历史出库单据子信息Mapper接口 @@ -58,4 +59,8 @@ public interface OutStockoutDetailBackMapper * @return 结果 */ public int deleteOutStockoutDetailBackByStockoutDetailIds(String[] stockoutDetailIds); + + void insertOutStockDetailBackFinish(@Param("list") List outStockoutDetailBacks); + + void deleteOutStockDetailList(@Param("list") List outStockoutDetailBacks); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/IOutStockoutDetailBackService.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/IOutStockoutDetailBackService.java index c434254..d53dfb4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/IOutStockoutDetailBackService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/IOutStockoutDetailBackService.java @@ -58,4 +58,8 @@ public interface IOutStockoutDetailBackService * @return 结果 */ public int deleteOutStockoutDetailBackByStockoutDetailId(String stockoutDetailId); + + void insertOutStockDetailBackFinish(List outStockoutDetailBacks); + + void deleteOutStockDetailList(List outStockoutDetailBacks); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/impl/OutStockoutDetailBackServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/impl/OutStockoutDetailBackServiceImpl.java index ce2237b..f3a730c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/impl/OutStockoutDetailBackServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/service/impl/OutStockoutDetailBackServiceImpl.java @@ -90,4 +90,14 @@ public class OutStockoutDetailBackServiceImpl implements IOutStockoutDetailBackS { return outStockoutDetailBackMapper.deleteOutStockoutDetailBackByStockoutDetailId(stockoutDetailId); } + + @Override + public void insertOutStockDetailBackFinish(List outStockoutDetailBacks) { + outStockoutDetailBackMapper.insertOutStockDetailBackFinish(outStockoutDetailBacks); + } + + @Override + public void deleteOutStockDetailList(List outStockoutDetailBacks) { + outStockoutDetailBackMapper.deleteOutStockDetailList(outStockoutDetailBacks); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java index 6fbc7a2..bc44e3c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java @@ -1,10 +1,7 @@ package com.ruoyi.pda.controller; -import com.ruoyi.api.domain.AgvMoveParam; import com.ruoyi.api.domain.RequestEnter; import com.ruoyi.api.domain.WcsPort; -import com.ruoyi.api.service.IToWcsService; -import com.ruoyi.bas.agvPoint.domain.AgvPoint; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -35,8 +32,6 @@ public class PdaController extends BaseController { private PdaService pdaService; @Autowired private IInStockinDetailService iInStockinDetailService; - @Autowired - private IToWcsService iToWcsService; /** * 查询是否有半满托盘 @@ -55,7 +50,7 @@ public class PdaController extends BaseController { @ResponseBody public AjaxResult selectDetailById(String inStockinDetailId) { InStockinDetail inStockinDetail = iInStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId); - if(inStockinDetail != null) { + if (inStockinDetail != null) { inStockinDetail.setQuantity(String.valueOf(Integer.valueOf(inStockinDetail.getQuantity()) - Integer.valueOf(inStockinDetail.getScanNum()))); } return AjaxResult.success(inStockinDetail); @@ -110,12 +105,13 @@ public class PdaController extends BaseController { /** * 出库确认查询子作业信息 + * * @param trayCodeMsg * @return */ @RequestMapping("/selectJobDetailByTray") @ResponseBody - public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg){ + public AjaxResult selectJobDetailByTray(@RequestBody TrayCodeMsg trayCodeMsg) { return pdaService.selectJobDetailByTray(trayCodeMsg); } @@ -144,19 +140,12 @@ public class PdaController extends BaseController { } - @RequestMapping("/selectDetailByPDTray") @ResponseBody public AjaxResult selectDetailByPDTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) { return pdaService.selectDetailByPDTray(trayCodeMakeSure); } - @RequestMapping("/selectHcTray") - @ResponseBody - public AjaxResult selectHcTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) { - return pdaService.selectHcTray(trayCodeMakeSure); - } - /** * 盘点出库确认 @@ -184,31 +173,33 @@ public class PdaController extends BaseController { return pdaService.updateWcsPort(wcsPort); } - /** - * 根据类型查询AGV站点 - */ - @RequestMapping("/selectAgvPointByType") - @ResponseBody - public AjaxResult selectAgvPointByType(String type) { - List list = pdaService.selectAgvPointByType(type); - return AjaxResult.success(list); - } - - @RequestMapping("/insertAgvJob") - @ResponseBody - public AjaxResult insertAgvJob(@RequestBody AgvMoveParam agvMoveParam) { - return iToWcsService.insertAgvMoveJob(agvMoveParam); - } - @RequestMapping("/hcoutMakesure") @ResponseBody - @Log(title = "手持机缓存出库确认",businessType = BusinessType.OTHER) - public AjaxResult hcoutMakesure(String trayCode ){ + @Log(title = "手持机缓存出库确认", businessType = BusinessType.OTHER) + public AjaxResult hcoutMakesure(String trayCode) { return pdaService.hcoutMakesure(trayCode); } + /** + * 平库入库 + */ + @RequestMapping("/inStockPk") + @ResponseBody + public AjaxResult inStockPk(@RequestBody TrayCodeMakeSure trayCodeMakeSure) { + return pdaService.completeInPk(trayCodeMakeSure); + } + + /** + * 库存查询(平库扫码查询托盘入库信息) + */ + @RequestMapping("/searchStock") + @ResponseBody + public AjaxResult searchStock(@RequestBody TrayCodeMakeSure trayCodeMakeSure) { + + return AjaxResult.success(pdaService.selectBasStockHc(trayCodeMakeSure.getTrayCode())); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java index 3e30ebe..0e1751e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMakeSure.java @@ -22,10 +22,14 @@ public class TrayCodeMakeSure { private String exitId; private String isFull; + // 选中传1 没选中传0 + private String isBoundByAccord; //拣选详情列表 private List mydoJobDetailList; //盘点详情列表 private List materials; //异常详情列表 private List materialDetails; + private String quantity; + private String stockinDetailId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java index 7109924..34a5a9c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java @@ -40,4 +40,6 @@ public interface PdaMapper { void outMakeSureException(HashMap map); void hcoutMakesure(HashMap map); + + void completeInPk(HashMap map); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java index a39ab2a..515c1ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java @@ -2,7 +2,6 @@ package com.ruoyi.pda.service; import com.ruoyi.api.domain.RequestEnter; import com.ruoyi.api.domain.WcsPort; -import com.ruoyi.bas.agvPoint.domain.AgvPoint; import com.ruoyi.bas.container.domain.BasContainer; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.pda.domain.TrayCodeMakeSure; @@ -48,8 +47,6 @@ public interface PdaService { public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure); - public AjaxResult selectHcTray(TrayCodeMakeSure trayCodeMakeSure); - AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure); AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure); @@ -58,7 +55,10 @@ public interface PdaService { AjaxResult updateWcsPort(WcsPort wcsport); - List selectAgvPointByType(String type); AjaxResult hcoutMakesure(String trayCode); + + AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure); + + AjaxResult selectBasStockHc(String trayCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index 34c2053..c58b71a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -6,8 +6,6 @@ import com.ruoyi.api.domain.RequestEnter; import com.ruoyi.api.domain.WcsPort; import com.ruoyi.api.service.IToWcsService; import com.ruoyi.api.service.IToWmsService; -import com.ruoyi.bas.agvPoint.domain.AgvPoint; -import com.ruoyi.bas.agvPoint.service.IAgvPointService; import com.ruoyi.check.commit.domain.CheckCommitRecord; import com.ruoyi.check.commit.service.ICheckCommitRecordService; import com.ruoyi.common.core.domain.AjaxResult; @@ -27,8 +25,6 @@ import com.ruoyi.pda.domain.TrayCodeMsg; import com.ruoyi.pda.mapper.PdaMapper; import com.ruoyi.pda.trayMsg.domain.TrayMsg; import com.ruoyi.pda.trayMsg.service.ITrayMsgService; -import com.ruoyi.stock.hcstock.domain.BasStockHc; -import com.ruoyi.stock.hcstock.service.IBasStockHcService; import com.ruoyi.stock.stock.domain.BasStock; import com.ruoyi.stock.stock.mapper.BasStockMapper; import com.ruoyi.system.service.ISysRoleService; @@ -64,17 +60,13 @@ public class PdaServiceImp implements PdaService { private BasStockMapper basStockMapper; @Autowired private IInStockinService inStockinService; - @Autowired - private IAgvPointService agvPointService; - @Autowired - private IBasStockHcService basStockHcService; @Override public List selectHasHalfTray(String inStockinDetailId) { InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inStockinDetailId); - InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId()); - inStockinDetail.setSpare4(inStockin.getDepartmentNo()); +// InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId()); +// inStockinDetail.setSpare4(inStockinDetail.getSpare4()); List hasHalfTray = basStockMapper.selectHasHalfTray(inStockinDetail); return hasHalfTray; } @@ -83,8 +75,8 @@ public class PdaServiceImp implements PdaService { @Override public AjaxResult halfTrayOut(TrayCodeMsg trayCodeMsg) { InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(trayCodeMsg.getStockinDetailId()); - InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId()); - inStockinDetail.setSpare4(inStockin.getDepartmentNo()); +// InStockin inStockin = inStockinService.selectInStockinByStockinId(inStockinDetail.getStockinId()); +// inStockinDetail.setSpare4(inStockin.getDepartmentNo()); List hasHalfTray = basStockMapper.selectHasHalfTray(inStockinDetail); HashMap map = new HashMap<>(); map.put("v_tray_code", hasHalfTray.get(0).getTrayCode()); @@ -126,6 +118,7 @@ public class PdaServiceImp implements PdaService { HashMap map = new HashMap<>(); map.put("v_tray_code", trayCodeMakeSure.getTrayCode()); map.put("v_stockin_detail_id", mydoJobDetail.getStockinDetailId()); + map.put("v_is_bound_accord", trayCodeMakeSure.getIsBoundByAccord()); map.put("v_quantity", Integer.valueOf(mydoJobDetail.getInQuantity())); pdaMapper.bindTray(map); if (!"10".equals(map.get("v_result").toString())) { @@ -207,23 +200,13 @@ public class PdaServiceImp implements PdaService { @Override public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure) { MydoJob mydoJob = new MydoJob(); - mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode()); + mydoJob.setExitId(trayCodeMakeSure.getExitId()); mydoJob.setStatus("3"); mydoJob.setInOrOut("28"); List mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob); return AjaxResult.success(mydoJobDetails); } - @Override - public AjaxResult selectHcTray(TrayCodeMakeSure trayCodeMakeSure) { - BasStockHc basStockHc = new BasStockHc(); - basStockHc.setTrayCode(trayCodeMakeSure.getTrayCode()); - List basStockHcs = basStockHcService.selectBasStockHcList(basStockHc); - return AjaxResult.success(basStockHcs); - - - } - @Override public AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure) { String trayCode = trayCodeMakeSure.getTrayCode(); @@ -257,9 +240,9 @@ public class PdaServiceImp implements PdaService { public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) { MydoJob mydoJob = new MydoJob(); - mydoJob.setTrayCode(trayCodeMakeSure.getTrayCode()); + mydoJob.setExitId(trayCodeMakeSure.getExitId()); mydoJob.setStatus("3"); - mydoJob.setInOrOut("28"); + mydoJob.setInOrOut("26"); List mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob); if (mydoJobDetails.isEmpty()) { return AjaxResult.error("该物料没有盘点出库作业，请检查"); @@ -269,7 +252,7 @@ public class PdaServiceImp implements PdaService { if (CollUtil.isNotEmpty(mydoJobDetailList)) { boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity())); if (flag) { - return AjaxResult.warn(MessageUtils.message("数量不可为0")); + return AjaxResult.warn(MessageUtils.message("warn.message8")); } for (MydoJobDetail mydoJobDetail : mydoJobDetailList) { //插入盘点提交表 @@ -279,7 +262,7 @@ public class PdaServiceImp implements PdaService { checkCommitRecord.setStockId(mydoJobDetail.getStockId()); checkCommitRecord.setSpare1(mydoJobDetail.getInOrOutDId()); checkCommitRecord.setSpare2(mydoJobDetail.getProductId()); -// checkCommitRecord.setSpare3(mydoJobDetail.getOutQuantity()); + checkCommitRecord.setSpare3(mydoJobDetail.getOutQuantity()); checkCommitRecordService.insertCheckCommitRecord(checkCommitRecord); } @@ -308,13 +291,6 @@ public class PdaServiceImp implements PdaService { return ajaxResult; } - @Override - public List selectAgvPointByType(String type) { - AgvPoint agvPoint = new AgvPoint(); - agvPoint.setType(type); - return agvPointService.selectAgvPointList(agvPoint); - } - @Override public AjaxResult hcoutMakesure(String trayCode) { HashMap map = new HashMap<>(); @@ -326,6 +302,28 @@ public class PdaServiceImp implements PdaService { } else { return AjaxResult.error(map.get("v_resultmsg").toString()); } + } + @Override + public AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure) { + HashMap map = new HashMap<>(); + map.put("v_tray_code", trayCodeMakeSure.getTrayCode()); + map.put("v_in_stockin_detail_id", trayCodeMakeSure.getStockinDetailId()); + map.put("v_quantity", trayCodeMakeSure.getQuantity()); + pdaMapper.completeInPk(map); + String result = map.get("v_result").toString(); + if ("10".equals(result)) { + return AjaxResult.success(); + } else { + return AjaxResult.error(map.get("v_resultmsg").toString()); + } + } + + @Override + public AjaxResult selectBasStockHc(String trayCode) { + BasStock basStock = new BasStock(); + basStock.setTrayCode(trayCode); + List stocks=basStockMapper.selectBasStockListHc(basStock); + return AjaxResult.success(stocks); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java index d630f00..58ed57a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/mapper/BasStockMapper.java @@ -73,4 +73,6 @@ public interface BasStockMapper List getStockBySerial(String trayCode); List selectHasHalfTray(InStockinDetail inStockinDetail); + + List selectBasStockListHc(BasStock basStock); } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index d17c5fb..c7b9fab 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:sqlserver://127.0.0.1:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true; + url: jdbc:sqlserver://192.168.188.236:1433;databaseName=FT546-wms;encrypt=true;trustServerCertificate=true; username: sa - password: 123456 + password: Flrd0914. # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml b/ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml index 6a067bb..c4fe8ae 100644 --- a/ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/agv/AgvContainerTaskMapper.xml @@ -1,4 +1,4 @@ - + @@ -25,15 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -102,3 +102,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml b/ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml index 99c335a..2ed84a1 100644 --- a/ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/ai/ChatMessageMapper.xml @@ -1,4 +1,4 @@ - + @@ -28,14 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -115,3 +115,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from chat_message where conversation_id = #{conversationId} + diff --git a/ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml b/ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml index 62ac9b6..2d43b17 100644 --- a/ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/ai/ConversationsMapper.xml @@ -1,4 +1,4 @@ - + @@ -26,17 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -105,3 +105,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml b/ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml index 75155ec..a4cc5a1 100644 --- a/ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/api/KnowledgeFileMapper.xml @@ -1,4 +1,4 @@ - + @@ -26,17 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -103,4 +103,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/api/MoveMsgMapper.xml b/ruoyi-admin/src/main/resources/mapper/api/MoveMsgMapper.xml index 8bb111e..7c1519e 100644 --- a/ruoyi-admin/src/main/resources/mapper/api/MoveMsgMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/api/MoveMsgMapper.xml @@ -1,4 +1,4 @@ - + @@ -26,17 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -105,4 +105,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasContainerDetailsMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasContainerDetailsMapper.xml index 707d37e..914c453 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasContainerDetailsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasContainerDetailsMapper.xml @@ -1,4 +1,4 @@ - + @@ -23,14 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -90,4 +90,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml index 9fd4d17..12a8819 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml @@ -1,4 +1,4 @@ - + @@ -26,11 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and container_id like concat('%', #{containerId}, '%') - and port_name = #{portName} - and status = #{status} - and product_type_quantity = #{productTypeQuantity} - and update_time = #{updateTime} - and operation_man = #{operationMan} + and port_name like concat('%', #{portName}, '%') + and status like concat('%', #{status}, '%') + and product_type_quantity like concat('%', #{productTypeQuantity}, '%') + and update_time like concat('%', #{updateTime}, '%') + and operation_man like concat('%', #{operationMan}, '%') @@ -102,4 +102,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml index d762e50..35e7956 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasCustomerMapper.xml @@ -1,4 +1,4 @@ - + @@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and customer_group_no like concat('%', #{customerGroupNo}, '%') and customer_name like concat('%', #{customerName}, '%') and simple_name like concat('%', #{simpleName}, '%') - and useable = #{useable} + and useable like concat('%', #{useable}, '%') and business_department like concat('%', #{businessDepartment}, '%') and salesman like concat('%', #{salesman}, '%') and mnemonic_code like concat('%', #{mnemonicCode}, '%') @@ -149,4 +149,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml index ba52e38..98985bc 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasJobIdMapper.xml @@ -1,4 +1,4 @@ - + @@ -34,25 +34,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -162,3 +162,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasProductCodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasProductCodeMapper.xml index 5477ce9..fa70aca 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasProductCodeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasProductCodeMapper.xml @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -129,4 +129,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortMapper.xml index 2fb90aa..690dd4a 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortMapper.xml @@ -1,4 +1,4 @@ - + @@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and port_name like concat('%', #{portName}, '%') - and port_type = #{portType} - and port_desc = #{portDesc} - and create_man = #{createMan} + and port_type like concat('%', #{portType}, '%') + and port_desc like concat('%', #{portDesc}, '%') + and create_man like concat('%', #{createMan}, '%') @@ -74,4 +74,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortRelMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortRelMapper.xml index ecc6728..53bfd74 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortRelMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasProductPortRelMapper.xml @@ -1,4 +1,4 @@ - + @@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and product_id not in (select product_id from bas_product_port_rel where port_id=#{portId}) - and product_id = #{productId} + and product_id like concat('%', #{productId}, '%') and product_name like concat('%', #{productName}, '%') @@ -112,3 +112,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml index 0ca261a..4bb69c0 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasRoadwayMapper.xml @@ -1,4 +1,4 @@ - + @@ -23,14 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -90,4 +90,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasSupplierMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasSupplierMapper.xml index b3bbc6b..434e1d9 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasSupplierMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasSupplierMapper.xml @@ -1,4 +1,4 @@ - + @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and supplier_group_no like concat('%', #{supplierGroupNo}, '%') and supplier_name like concat('%', #{supplierName}, '%') and simple_name like concat('%', #{simpleName}, '%') - and useable = #{useable} + and useable like concat('%', #{useable}, '%') and supplier_arae like concat('%', #{supplierArae}, '%') and taxpayer_registration_number like concat('%', #{taxpayerRegistrationNumber}, '%') and country like concat('%', #{country}, '%') @@ -139,4 +139,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml index 1d81f5b..4be0cb1 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasTagMapper.xml @@ -1,4 +1,4 @@ - + @@ -23,14 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -93,3 +93,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml index 791a9ff..33caa50 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml @@ -1,4 +1,4 @@ - + @@ -32,9 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and remarks like concat('%',#{remarks}, '%') and min_num like concat('%',#{minNum}, '%') and max_num like concat('%',#{maxNum}, '%') - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} + and spare1 like concat('%', #{spare1}, '%') + and spare2 like concat('%', #{spare2}, '%') + and spare3 like concat('%', #{spare3}, '%') @@ -103,4 +103,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml index 631bd54..9adf098 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml @@ -1,4 +1,4 @@ - + @@ -26,11 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -98,3 +98,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/BasWarehousePortMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/BasWarehousePortMapper.xml index 12d8f18..26b7155 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/BasWarehousePortMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/BasWarehousePortMapper.xml @@ -1,4 +1,4 @@ - + @@ -19,10 +19,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -70,4 +70,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml index fe9fdc4..dcbfeb1 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml @@ -1,4 +1,4 @@ - + @@ -63,24 +63,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bcs.cargo_space_id like concat('%', #{cargoSpaceId}, '%') - and bcs.warehouse_id = #{warehouseId} - and bcs.roadway_id = #{roadwayId} - and bcs.cargo_area_id = #{cargoAreaId} - and bcs.the_type = #{theType} + and bcs.warehouse_id like concat('%', #{warehouseId}, '%') + and bcs.roadway_id like concat('%', #{roadwayId}, '%') + and bcs.cargo_area_id like concat('%', #{cargoAreaId}, '%') + and bcs.the_type like concat('%', #{theType}, '%') and bcs.the_type_name like concat('%', #{theTypeName}, '%') and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%') - and bcs.the_platoon = #{thePlatoon} - and bcs.the_column = #{theColumn} - and bcs.the_floor = #{theFloor} - and bcs.status = #{status} - and bcs.locked = #{locked} + and bcs.the_platoon like concat('%', #{thePlatoon}, '%') + and bcs.the_column like concat('%', #{theColumn}, '%') + and bcs.the_floor like concat('%', #{theFloor}, '%') + and bcs.status like concat('%', #{status}, '%') + and bcs.locked like concat('%', #{locked}, '%') and bcs.tray_code like concat('%', #{trayCode}, '%') - and bcs.cargo_hight = #{cargoHight} - and bcs.iss_double = #{issDouble} - and bcs.group_coding_no = #{groupCodingNo} - and bcs.group_coding = #{groupCoding} - and bcs.cargo_space_logo = #{cargoSpaceLogo} - and bcs.this_cargo_area = #{thisCargoArea} + and bcs.cargo_hight like concat('%', #{cargoHight}, '%') + and bcs.iss_double like concat('%', #{issDouble}, '%') + and bcs.group_coding_no like concat('%', #{groupCodingNo}, '%') + and bcs.group_coding like concat('%', #{groupCoding}, '%') + and bcs.cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%') + and bcs.this_cargo_area like concat('%', #{thisCargoArea}, '%') ${params.warehouseDataScope} @@ -188,10 +188,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE status = '1' and locked = 'N' - and warehouse_id = #{warehouseId} + and warehouse_id like concat('%', #{warehouseId}, '%') - and roadway_id = #{roadwayId} + and roadway_id like concat('%', #{roadwayId}, '%') ORDER BY the_platoon, the_floor,the_column @@ -219,18 +219,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and br.roadway_id = bcs.roadway_id and bp.product_id = bs.product_id and br.out_locked = 'N' - and bcs.warehouse_id = #{warehouseId} - and bcs.roadway_id = #{roadwayId} + and bcs.warehouse_id like concat('%', #{warehouseId}, '%') + and bcs.roadway_id like concat('%', #{roadwayId}, '%') and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%') - and bcs.the_platoon = #{thePlatoon} - and bcs.the_column = #{theColumn} - and bcs.the_floor = #{theFloor} - and bcs.status = #{status} - and bcs.locked = #{locked} + and bcs.the_platoon like concat('%', #{thePlatoon}, '%') + and bcs.the_column like concat('%', #{theColumn}, '%') + and bcs.the_floor like concat('%', #{theFloor}, '%') + and bcs.status like concat('%', #{status}, '%') + and bcs.locked like concat('%', #{locked}, '%') and bs.tray_code like concat('%', #{trayCode}, '%') - and bs.spare7 = #{spare7} + and bs.spare7 like concat('%', #{spare7}, '%') and bs.spare6 like concat('%', #{spare6}, '%') and bs.product_id like concat('%', #{productId}, '%') and bp.product_name like concat('%', #{productName}, '%') + diff --git a/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml index 44029d8..c3bf2f8 100644 --- a/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml @@ -1,4 +1,4 @@ - + @@ -29,11 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and warehouse_name like concat('%', #{warehouseName}, '%') - and address = #{address} - and c_desc = #{cDesc} - and warehouse_kind = #{warehouseKind} - and warehouse_type = #{warehouseType} - and is_current = #{isCurrent} + and address like concat('%', #{address}, '%') + and c_desc like concat('%', #{cDesc}, '%') + and warehouse_kind like concat('%', #{warehouseKind}, '%') + and warehouse_type like concat('%', #{warehouseType}, '%') + and is_current like concat('%', #{isCurrent}, '%') and warehouse_id in @@ -111,3 +111,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml index 35ec7e1..86061f3 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckCommitRecordMapper.xml @@ -1,4 +1,4 @@ - + @@ -21,13 +21,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -79,4 +79,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{pdGuid} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml index 6aa0b1c..92da99d 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml @@ -1,4 +1,4 @@ - + @@ -72,46 +72,46 @@ - and r.check_stock_detail_id = #{checkStockDetailId} + and r.check_stock_detail_id like concat('%', #{checkStockDetailId}, '%') - and r.stock_id = #{stockId} + and r.stock_id like concat('%', #{stockId}, '%') - and r.tray_code = #{trayCode} + and r.tray_code like concat('%', #{trayCode}, '%') - and r.cargo_space_id = #{cargoSpaceId} + and r.cargo_space_id like concat('%', #{cargoSpaceId}, '%') - and r.product_id = #{productId} + and r.product_id like concat('%', #{productId}, '%') - and r.lot_no = #{lotNo} + and r.lot_no like concat('%', #{lotNo}, '%') - and r.supplier = #{supplier} + and r.supplier like concat('%', #{supplier}, '%') - and r.customer = #{customer} + and r.customer like concat('%', #{customer}, '%') - and r.old_quantity = #{oldQuantity} + and r.old_quantity like concat('%', #{oldQuantity}, '%') - and r.new_quantity = #{newQuantity} + and r.new_quantity like concat('%', #{newQuantity}, '%') - and r.record_type = #{recordType} + and r.record_type like concat('%', #{recordType}, '%') - and r.product_guid = #{productGuid} + and r.product_guid like concat('%', #{productGuid}, '%') - and r.status = #{status} + and r.status like concat('%', #{status}, '%') - and r.warehouse_id = #{warehouseId} + and r.warehouse_id like concat('%', #{warehouseId}, '%') ${params.warehouseDataScope} @@ -200,3 +200,4 @@ + diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml index 29b0b26..89d9a8c 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml @@ -1,4 +1,4 @@ - + @@ -72,46 +72,46 @@ - and r.check_stock_detail_id = #{checkStockDetailId} + and r.check_stock_detail_id like concat('%', #{checkStockDetailId}, '%') - and r.stock_id = #{stockId} + and r.stock_id like concat('%', #{stockId}, '%') - and r.tray_code = #{trayCode} + and r.tray_code like concat('%', #{trayCode}, '%') - and r.cargo_space_id = #{cargoSpaceId} + and r.cargo_space_id like concat('%', #{cargoSpaceId}, '%') - and r.product_id = #{productId} + and r.product_id like concat('%', #{productId}, '%') - and r.lot_no = #{lotNo} + and r.lot_no like concat('%', #{lotNo}, '%') - and r.supplier = #{supplier} + and r.supplier like concat('%', #{supplier}, '%') - and r.customer = #{customer} + and r.customer like concat('%', #{customer}, '%') - and r.old_quantity = #{oldQuantity} + and r.old_quantity like concat('%', #{oldQuantity}, '%') - and r.new_quantity = #{newQuantity} + and r.new_quantity like concat('%', #{newQuantity}, '%') - and r.record_type = #{recordType} + and r.record_type like concat('%', #{recordType}, '%') - and r.product_guid = #{productGuid} + and r.product_guid like concat('%', #{productGuid}, '%') - and r.status = #{status} + and r.status like concat('%', #{status}, '%') - and r.warehouse_id = #{warehouseId} + and r.warehouse_id like concat('%', #{warehouseId}, '%') ${params.warehouseDataScope} @@ -200,3 +200,4 @@ + diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml index 46ecb11..52358bd 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml @@ -1,4 +1,4 @@ - + @@ -98,34 +98,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -137,34 +137,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultMap="CheckStockinDetailResult"> - and csd.stock_check_guid = #{stockCheckGuid} - and csd.stock_check_id = #{stockCheckId} - and csd.lot_no = #{lotNo} - and csd.product_guid = #{productGuid} - and csd.product_id = #{productId} - and csd.quantity = #{quantity} - and csd.quantity_x = #{quantityX} - and csd.quantity_j = #{quantityJ} - and csd.price = #{price} - and csd.cargo_no = #{cargoNo} - and csd.assign_num = #{assignNum} - and csd.assign_num_x = #{assignNumX} - and csd.assign_num_j = #{assignNumJ} - and csd.print_date = #{printDate} - and csd.stock_status = #{stockStatus} - and csd.supplier_id = #{supplierId} - and csd.customer_id = #{customerId} - and csd.unit = #{unit} - and csd.spec = #{spec} - and csd.scan_num = #{scanNum} - and csd.scan_num_x = #{scanNumX} - and csd.scan_num_j = #{scanNumJ} - and csd.spare1 = #{spare1} - and csd.spare2 = #{spare2} - and csd.spare3 = #{spare3} - and csd.spare4 = #{spare4} - and csd.spare5 = #{spare5} - and csd.spare6 = #{spare6} + and csd.stock_check_guid like concat('%', #{stockCheckGuid}, '%') + and csd.stock_check_id like concat('%', #{stockCheckId}, '%') + and csd.lot_no like concat('%', #{lotNo}, '%') + and csd.product_guid like concat('%', #{productGuid}, '%') + and csd.product_id like concat('%', #{productId}, '%') + and csd.quantity like concat('%', #{quantity}, '%') + and csd.quantity_x like concat('%', #{quantityX}, '%') + and csd.quantity_j like concat('%', #{quantityJ}, '%') + and csd.price like concat('%', #{price}, '%') + and csd.cargo_no like concat('%', #{cargoNo}, '%') + and csd.assign_num like concat('%', #{assignNum}, '%') + and csd.assign_num_x like concat('%', #{assignNumX}, '%') + and csd.assign_num_j like concat('%', #{assignNumJ}, '%') + and csd.print_date like concat('%', #{printDate}, '%') + and csd.stock_status like concat('%', #{stockStatus}, '%') + and csd.supplier_id like concat('%', #{supplierId}, '%') + and csd.customer_id like concat('%', #{customerId}, '%') + and csd.unit like concat('%', #{unit}, '%') + and csd.spec like concat('%', #{spec}, '%') + and csd.scan_num like concat('%', #{scanNum}, '%') + and csd.scan_num_x like concat('%', #{scanNumX}, '%') + and csd.scan_num_j like concat('%', #{scanNumJ}, '%') + and csd.spare1 like concat('%', #{spare1}, '%') + and csd.spare2 like concat('%', #{spare2}, '%') + and csd.spare3 like concat('%', #{spare3}, '%') + and csd.spare4 like concat('%', #{spare4}, '%') + and csd.spare5 like concat('%', #{spare5}, '%') + and csd.spare6 like concat('%', #{spare6}, '%') @@ -283,3 +283,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml index 3568f9f..7058fc2 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml @@ -1,4 +1,4 @@ - + @@ -63,34 +63,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -235,3 +235,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select * from check_stockin_detail where stock_check_id = #{stockCheckId} + diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml index c098c28..18c6a9c 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml @@ -1,4 +1,4 @@ - + @@ -59,24 +59,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -87,24 +87,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and cs.stock_check_id = #{stockCheckId} - and cs.check_type = #{checkType} - and cs.create_date = #{createDate} - and cs.create_man_id = #{createManId} - and cs.status = #{status} - and cs.warehouse_id = #{warehouseId} - and cs.finish_date = #{finishDate} - and cs.erp_bill = #{erpBill} - and cs.stock_source = #{stockSource} - and cs.department_no = #{departmentNo} - and cs.customer_no = #{customerNo} - and cs.class_no = #{classNo} - and cs.supplier_no = #{supplierNo} - and cs.spare1 = #{spare1} - and cs.spare2 = #{spare2} - and cs.spare3 = #{spare3} - and cs.spare4 = #{spare4} - and cs.spare5 = #{spare5} + and cs.stock_check_id like concat('%', #{stockCheckId}, '%') + and cs.check_type like concat('%', #{checkType}, '%') + and cs.create_date like concat('%', #{createDate}, '%') + and cs.create_man_id like concat('%', #{createManId}, '%') + and cs.status like concat('%', #{status}, '%') + and cs.warehouse_id like concat('%', #{warehouseId}, '%') + and cs.finish_date like concat('%', #{finishDate}, '%') + and cs.erp_bill like concat('%', #{erpBill}, '%') + and cs.stock_source like concat('%', #{stockSource}, '%') + and cs.department_no like concat('%', #{departmentNo}, '%') + and cs.customer_no like concat('%', #{customerNo}, '%') + and cs.class_no like concat('%', #{classNo}, '%') + and cs.supplier_no like concat('%', #{supplierNo}, '%') + and cs.spare1 like concat('%', #{spare1}, '%') + and cs.spare2 like concat('%', #{spare2}, '%') + and cs.spare3 like concat('%', #{spare3}, '%') + and cs.spare4 like concat('%', #{spare4}, '%') + and cs.spare5 like concat('%', #{spare5}, '%') ${params.warehouseDataScope} @@ -183,3 +183,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinBackMapper.xml index 7e0c8b1..fa0edd4 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinBackMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinBackMapper.xml @@ -1,4 +1,4 @@ - + @@ -27,40 +27,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, - customer_no, class_no, supplier_no,send_status,send_time,msg from in_stockin_back + customer_no, class_no, supplier_no,send_status,send_time,msg,company_short_name,account_set_no from in_stockin_back @@ -167,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailBackMapper.xml index 2e2a7fa..797c3c1 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailBackMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailBackMapper.xml @@ -1,4 +1,4 @@ - + @@ -96,41 +96,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -274,6 +274,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from in_stockin_detail_back where stockin_detail_id = #{stockinDetailId} + + delete from in_stockin_detail_back where stockin_detail_id in + + #{stockinDetailId} + + + INSERT INTO in_stockin_detail_back_finish @@ -282,22 +289,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - delete from in_stockin_detail_back where stockin_detail_id in - - #{stockinDetailId} - - - - DELETE FROM in_stockin_detail + DELETE FROM in_stockin_detail_back WHERE stockin_detail_id IN - - #{id} + + #{item.stockinDetailId} - - - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml index 8a9d58d..67aa1e0 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml @@ -1,4 +1,4 @@ - + @@ -103,34 +103,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -142,34 +142,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultMap="InStockinDetailResult"> - and isd.stockin_guid = #{stockinGuid} - and isd.stockin_id = #{stockinId} - and isd.lot_no = #{lotNo} - and isd.product_guid = #{productGuid} - and isd.product_id = #{productId} - and isd.quantity = #{quantity} - and isd.quantity_x = #{quantityX} - and isd.quantity_j = #{quantityJ} - and isd.price = #{price} - and isd.cargo_no = #{cargoNo} - and isd.assign_num = #{assignNum} - and isd.assign_num_x = #{assignNumX} - and isd.assign_num_j = #{assignNumJ} - and isd.print_date = #{printDate} - and isd.stock_status = #{stockStatus} - and isd.supplier_id = #{supplierId} - and isd.customer_id = #{customerId} - and isd.unit = #{unit} - and isd.spec = #{spec} - and isd.spare1 = #{spare1} - and isd.spare2 = #{spare2} - and isd.spare3 = #{spare3} - and isd.spare4 = #{spare4} - and isd.spare5 = #{spare5} - and isd.spare6 = #{spare6} - and isd.scan_num = #{scanNum} - and isd.scan_num_x = #{scanNumX} - and isd.scan_num_j = #{scanNumJ} + and isd.stockin_guid like concat('%', #{stockinGuid}, '%') + and isd.stockin_id like concat('%', #{stockinId}, '%') + and isd.lot_no like concat('%', #{lotNo}, '%') + and isd.product_guid like concat('%', #{productGuid}, '%') + and isd.product_id like concat('%', #{productId}, '%') + and isd.quantity like concat('%', #{quantity}, '%') + and isd.quantity_x like concat('%', #{quantityX}, '%') + and isd.quantity_j like concat('%', #{quantityJ}, '%') + and isd.price like concat('%', #{price}, '%') + and isd.cargo_no like concat('%', #{cargoNo}, '%') + and isd.assign_num like concat('%', #{assignNum}, '%') + and isd.assign_num_x like concat('%', #{assignNumX}, '%') + and isd.assign_num_j like concat('%', #{assignNumJ}, '%') + and isd.print_date like concat('%', #{printDate}, '%') + and isd.stock_status like concat('%', #{stockStatus}, '%') + and isd.supplier_id like concat('%', #{supplierId}, '%') + and isd.customer_id like concat('%', #{customerId}, '%') + and isd.unit like concat('%', #{unit}, '%') + and isd.spec like concat('%', #{spec}, '%') + and isd.spare1 like concat('%', #{spare1}, '%') + and isd.spare2 like concat('%', #{spare2}, '%') + and isd.spare3 like concat('%', #{spare3}, '%') + and isd.spare4 like concat('%', #{spare4}, '%') + and isd.spare5 like concat('%', #{spare5}, '%') + and isd.spare6 like concat('%', #{spare6}, '%') + and isd.scan_num like concat('%', #{scanNum}, '%') + and isd.scan_num_x like concat('%', #{scanNumX}, '%') + and isd.scan_num_j like concat('%', #{scanNumJ}, '%') @@ -288,3 +288,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml index 64ce872..48f196c 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml @@ -1,4 +1,4 @@ - + @@ -69,34 +69,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -147,7 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bar_code, is_batch_manage, old_project_no, - + #{stockinDetailId}, #{stockinGuid}, @@ -190,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{isBatchManage}, #{oldProjectNo}, - + INSERT INTO in_stockin_detail @@ -343,9 +343,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by ist.create_date desc - - - - - + diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml index 5a19b7d..fd8847e 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml @@ -1,4 +1,4 @@ - + @@ -86,24 +86,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -121,24 +121,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and is2.stockin_id = #{stockinId} - and is2.in_type = #{inType} - and is2.create_date = #{createDate} - and is2.create_man_id = #{createManId} - and is2.status = #{status} - and is2.warehouse_id = #{warehouseId} + and is2.stockin_id like concat('%', #{stockinId}, '%') + and is2.in_type like concat('%', #{inType}, '%') + and is2.create_date like concat('%', #{createDate}, '%') + and is2.create_man_id like concat('%', #{createManId}, '%') + and is2.status like concat('%', #{status}, '%') + and is2.warehouse_id like concat('%', #{warehouseId}, '%') and is2.create_date >= #{startDate} and is2.create_date <= #{finishDate} - and is2.erp_bill = #{erpBill} - and is2.stock_source = #{stockSource} + and is2.erp_bill like concat('%', #{erpBill}, '%') + and is2.stock_source like concat('%', #{stockSource}, '%') and is2.department_no like concat('%', #{departmentNo},'%') - and is2.customer_no = #{customerNo} - and is2.class_no = #{classNo} - and is2.supplier_no = #{supplierNo} + and is2.customer_no like concat('%', #{customerNo}, '%') + and is2.class_no like concat('%', #{classNo}, '%') + and is2.supplier_no like concat('%', #{supplierNo}, '%') and is2.spare1 like concat('%', #{spare1},'%') and is2.spare2 like concat('%', #{spare2},'%') - and is2.spare4 = #{spare4} - and is2.spare3 = #{spare3} - and is2.spare5 = #{spare5} + and is2.spare4 like concat('%', #{spare4}, '%') + and is2.spare3 like concat('%', #{spare3}, '%') + and is2.spare5 like concat('%', #{spare5}, '%') and is2.stockin_id in ( select distinct stockin_id from in_stockin_detail isd @@ -142,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spare5, company_short_name, account_set_no, - + #{stockinGuid}, #{stockinId}, @@ -163,9 +161,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{spare4}, #{spare3}, #{spare5}, - #{companyShortName}, - #{accountSetNo}, - + #{companyShortName}, + #{accountSetNo}, + insert into in_stockin_finish @@ -245,3 +243,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml index 8fcd1e0..88eaed5 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml @@ -1,4 +1,4 @@ - + @@ -24,14 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -92,4 +92,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml index dd402f1..f32aeea 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml @@ -1,4 +1,4 @@ - + @@ -84,32 +84,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from mydo_job_detail_finish mjd left join bas_product bp on mjd.product_id = bp.product_id - and mjd.job_detail_id = #{jobDetailId} - and mjd.job_id = #{jobId} - and mjd.stock_id = #{stockId} - and mjd.lot_no = #{lotNo} - and mjd.in_date = #{inDate} - and mjd.in_or_out_id = #{inOrOutId} - and mjd.in_or_out_d_id = #{inOrOutDId} - and mjd.product_guid = #{productGuid} - and mjd.product_id = #{productId} - and mjd.stock_status = #{stockStatus} - and mjd.in_quantity = #{inQuantity} - and mjd.stock_quantity = #{stockQuantity} - and mjd.out_quantity = #{outQuantity} - and mjd.layer_quantity = #{layerQuantity} - and mjd.out_layer_quantity = #{outLayerQuantity} - and mjd.give_num = #{giveNum} - and mjd.stockin_id = #{stockinId} - and mjd.stacking_id = #{stackingId} - and mjd.exit_id = #{exitId} - and mjd.print_date = #{printDate} - and mjd.customer_id = #{customerId} - and mjd.supplier_id = #{supplierId} - and mjd.spare1 = #{spare1} - and mjd.spare2 = #{spare2} - and mjd.spare3 = #{spare3} - and mjd.spare4 = #{spare4} + and mjd.job_detail_id like concat('%', #{jobDetailId}, '%') + and mjd.job_id like concat('%', #{jobId}, '%') + and mjd.stock_id like concat('%', #{stockId}, '%') + and mjd.lot_no like concat('%', #{lotNo}, '%') + and mjd.in_date like concat('%', #{inDate}, '%') + and mjd.in_or_out_id like concat('%', #{inOrOutId}, '%') + and mjd.in_or_out_d_id like concat('%', #{inOrOutDId}, '%') + and mjd.product_guid like concat('%', #{productGuid}, '%') + and mjd.product_id like concat('%', #{productId}, '%') + and mjd.stock_status like concat('%', #{stockStatus}, '%') + and mjd.in_quantity like concat('%', #{inQuantity}, '%') + and mjd.stock_quantity like concat('%', #{stockQuantity}, '%') + and mjd.out_quantity like concat('%', #{outQuantity}, '%') + and mjd.layer_quantity like concat('%', #{layerQuantity}, '%') + and mjd.out_layer_quantity like concat('%', #{outLayerQuantity}, '%') + and mjd.give_num like concat('%', #{giveNum}, '%') + and mjd.stockin_id like concat('%', #{stockinId}, '%') + and mjd.stacking_id like concat('%', #{stackingId}, '%') + and mjd.exit_id like concat('%', #{exitId}, '%') + and mjd.print_date like concat('%', #{printDate}, '%') + and mjd.customer_id like concat('%', #{customerId}, '%') + and mjd.supplier_id like concat('%', #{supplierId}, '%') + and mjd.spare1 like concat('%', #{spare1}, '%') + and mjd.spare2 like concat('%', #{spare2}, '%') + and mjd.spare3 like concat('%', #{spare3}, '%') + and mjd.spare4 like concat('%', #{spare4}, '%') @@ -299,3 +299,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml index 9a81ee3..35b821b 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml @@ -1,4 +1,4 @@ - + @@ -87,32 +87,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from mydo_job_detail mjd left join bas_product bp on mjd.product_id = bp.product_id - and mjd.job_detail_id = #{jobDetailId} - and mjd.job_id = #{jobId} - and mjd.stock_id = #{stockId} - and mjd.lot_no = #{lotNo} - and mjd.in_date = #{inDate} - and mjd.in_or_out_id = #{inOrOutId} - and mjd.in_or_out_d_id = #{inOrOutDId} - and mjd.product_guid = #{productGuid} - and mjd.product_id = #{productId} - and mjd.stock_status = #{stockStatus} - and mjd.in_quantity = #{inQuantity} - and mjd.stock_quantity = #{stockQuantity} - and mjd.out_quantity = #{outQuantity} - and mjd.layer_quantity = #{layerQuantity} - and mjd.out_layer_quantity = #{outLayerQuantity} - and mjd.give_num = #{giveNum} - and mjd.stockin_id = #{stockinId} - and mjd.stacking_id = #{stackingId} - and mjd.exit_id = #{exitId} - and mjd.print_date = #{printDate} - and mjd.customer_id = #{customerId} - and mjd.supplier_id = #{supplierId} - and mjd.spare1 = #{spare1} - and mjd.spare2 = #{spare2} - and mjd.spare3 = #{spare3} - and mjd.spare4 = #{spare4} + and mjd.job_detail_id like concat('%', #{jobDetailId}, '%') + and mjd.job_id like concat('%', #{jobId}, '%') + and mjd.stock_id like concat('%', #{stockId}, '%') + and mjd.lot_no like concat('%', #{lotNo}, '%') + and mjd.in_date like concat('%', #{inDate}, '%') + and mjd.in_or_out_id like concat('%', #{inOrOutId}, '%') + and mjd.in_or_out_d_id like concat('%', #{inOrOutDId}, '%') + and mjd.product_guid like concat('%', #{productGuid}, '%') + and mjd.product_id like concat('%', #{productId}, '%') + and mjd.stock_status like concat('%', #{stockStatus}, '%') + and mjd.in_quantity like concat('%', #{inQuantity}, '%') + and mjd.stock_quantity like concat('%', #{stockQuantity}, '%') + and mjd.out_quantity like concat('%', #{outQuantity}, '%') + and mjd.layer_quantity like concat('%', #{layerQuantity}, '%') + and mjd.out_layer_quantity like concat('%', #{outLayerQuantity}, '%') + and mjd.give_num like concat('%', #{giveNum}, '%') + and mjd.stockin_id like concat('%', #{stockinId}, '%') + and mjd.stacking_id like concat('%', #{stackingId}, '%') + and mjd.exit_id like concat('%', #{exitId}, '%') + and mjd.print_date like concat('%', #{printDate}, '%') + and mjd.customer_id like concat('%', #{customerId}, '%') + and mjd.supplier_id like concat('%', #{supplierId}, '%') + and mjd.spare1 like concat('%', #{spare1}, '%') + and mjd.spare2 like concat('%', #{spare2}, '%') + and mjd.spare3 like concat('%', #{spare3}, '%') + and mjd.spare4 like concat('%', #{spare4}, '%') @@ -404,7 +404,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mjd.spare4, mjd.pick_quantity, mjd.out_quantity-mjd.pick_quantity as pick_quantity_real, - mjd.product_name, + bp.product_name, mjd.spare5, mjd.spare6, mjd.spare7, @@ -415,11 +415,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mj.tray_code from mydo_job_detail mjd - + left join bas_product bp on mjd.product_id = bp.product_id left join mydo_job mj on mjd.job_id = mj.job_id - where tray_code=#{trayCode} + where mj.exit_id=#{exitId} and mj.status='3' - - and mj.in_or_out = #{inOrOut} + and mj.execution_phase=2 + and mj.in_or_out like concat('%', #{inOrOut}, '%') + diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml index f35a52a..ae37714 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml @@ -1,4 +1,4 @@ - + @@ -60,30 +60,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select top(1)* from mydo_job mj - where in_or_out<20 - and mj.tray_code = #{trayCode} - - + where in_or_out<20 and mj.entrance_id like concat('%', #{entranceId}, '%') + and mj.status like concat('%', #{status}, '%') + and mj.line_id like concat('%', #{lineId}, '%') + and mj.workshop_id like concat('%', #{workshopId}, '%') order by mj.create_time @@ -279,3 +279,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" )} + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/agv/AgvContainerTaskMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/agv/AgvContainerTaskMapper.xml new file mode 100644 index 0000000..d77df5c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/agv/AgvContainerTaskMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + select id, container, start_point, end_point, create_time, start_time, finish_time, task_no, status, spare1, spare2 from agv_container_task + + + + + + + + insert into agv_container_task + + container, + start_point, + end_point, + create_time, + start_time, + finish_time, + task_no, + status, + spare1, + spare2, + + + #{container}, + #{startPoint}, + #{endPoint}, + #{createTime}, + #{startTime}, + #{finishTime}, + #{taskNo}, + #{status}, + #{spare1}, + #{spare2}, + + + + insert into agv_container_task_finish + select * from agv_container_task where id = #{id} + + + + update agv_container_task + + container = #{container}, + start_point = #{startPoint}, + end_point = #{endPoint}, + create_time = #{createTime}, + start_time = #{startTime}, + finish_time = #{finishTime}, + task_no = #{taskNo}, + status = #{status}, + spare1 = #{spare1}, + spare2 = #{spare2}, + + where id = #{id} + + + + delete from agv_container_task where id = #{id} + + + + delete from agv_container_task where id in + + #{id} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/ai/ChatMessageMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/ai/ChatMessageMapper.xml new file mode 100644 index 0000000..60d0853 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/ai/ChatMessageMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, session_id, conversation_id, content, role, deduct_cost, total_tokens, model_name, create_dept, create_by, create_time, update_by, update_time, remark from chat_message + + + + + + + + insert into chat_message + + id, + session_id, + conversation_id, + content, + role, + deduct_cost, + total_tokens, + model_name, + create_dept, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{id}, + #{sessionId}, + #{conversationId}, + #{content}, + #{role}, + #{deductCost}, + #{totalTokens}, + #{modelName}, + #{createDept}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update chat_message + + session_id = #{sessionId}, + conversation_id = #{conversationId}, + content = #{content}, + role = #{role}, + deduct_cost = #{deductCost}, + total_tokens = #{totalTokens}, + model_name = #{modelName}, + create_dept = #{createDept}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from chat_message where id = #{id} + + + + delete from chat_message where id in + + #{id} + + + + delete from chat_message where conversation_id = #{conversationId} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/ai/ConversationsMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/ai/ConversationsMapper.xml new file mode 100644 index 0000000..aedf6cb --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/ai/ConversationsMapper.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + select id, session_id, user_id, title, status, metadata, first_query, message_count, token_usage, created_at, updated_at, last_interaction_at from conversations + + + + + + + + insert into conversations + + session_id, + user_id, + title, + status, + metadata, + first_query, + message_count, + token_usage, + created_at, + updated_at, + last_interaction_at, + + + #{sessionId}, + #{userId}, + #{title}, + #{status}, + #{metadata}, + #{firstQuery}, + #{messageCount}, + #{tokenUsage}, + #{createdAt}, + #{updatedAt}, + #{lastInteractionAt}, + + + + + update conversations + + session_id = #{sessionId}, + user_id = #{userId}, + title = #{title}, + status = #{status}, + metadata = #{metadata}, + first_query = #{firstQuery}, + message_count = #{messageCount}, + token_usage = #{tokenUsage}, + created_at = #{createdAt}, + updated_at = #{updatedAt}, + last_interaction_at = #{lastInteractionAt}, + + where id = #{id} + + + + delete from conversations where id = #{id} + + + + delete from conversations where id in + + #{id} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/api/JobStatisticsMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/api/JobStatisticsMapper.xml new file mode 100644 index 0000000..ed4264c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/api/JobStatisticsMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/api/KnowledgeFileMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/api/KnowledgeFileMapper.xml new file mode 100644 index 0000000..1e2fa32 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/api/KnowledgeFileMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + select id, knowledge_base_id, file_name, file_path, file_size, file_type, description, is_vectorized, vectorized_time, upload_time, updated_at, is_deleted from knowledge_file + + + + + + + + insert into knowledge_file + + knowledge_base_id, + file_name, + file_path, + file_size, + file_type, + description, + is_vectorized, + vectorized_time, + upload_time, + updated_at, + is_deleted, + + + #{knowledgeBaseId}, + #{fileName}, + #{filePath}, + #{fileSize}, + #{fileType}, + #{description}, + #{isVectorized}, + #{vectorizedTime}, + #{uploadTime}, + #{updatedAt}, + #{isDeleted}, + + + + + update knowledge_file + + knowledge_base_id = #{knowledgeBaseId}, + file_name = #{fileName}, + file_path = #{filePath}, + file_size = #{fileSize}, + file_type = #{fileType}, + description = #{description}, + is_vectorized = #{isVectorized}, + vectorized_time = #{vectorizedTime}, + upload_time = #{uploadTime}, + updated_at = #{updatedAt}, + is_deleted = #{isDeleted}, + + where id = #{id} + + + + delete from knowledge_file where id = #{id} + + + + delete from knowledge_file where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/api/MoveMsgMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/api/MoveMsgMapper.xml new file mode 100644 index 0000000..16d85c4 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/api/MoveMsgMapper.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + select id, tray_code, old_space, new_space, status, send_time, msg, spare1, spare2, spare3, spare4, spare5 from move_msg + + + + + + + + insert into move_msg + + id, + tray_code, + old_space, + new_space, + status, + send_time, + msg, + spare1, + spare2, + spare3, + spare4, + spare5, + + + #{id}, + #{trayCode}, + #{oldSpace}, + #{newSpace}, + #{status}, + #{sendTime}, + #{msg}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + + + + + update move_msg + + tray_code = #{trayCode}, + old_space = #{oldSpace}, + new_space = #{newSpace}, + status = #{status}, + send_time = #{sendTime}, + msg = #{msg}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + + where id = #{id} + + + + delete from move_msg where id = #{id} + + + + delete from move_msg where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerDetailsMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerDetailsMapper.xml new file mode 100644 index 0000000..14345c0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerDetailsMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + select id, container_id, product_id, product_name, quantity, unit, spare1, spare2, spare3 from bas_container_details + + + + + + + + insert into bas_container_details + + id, + container_id, + product_id, + product_name, + quantity, + unit, + spare1, + spare2, + spare3, + + + #{id}, + #{containerId}, + #{productId}, + #{productName}, + #{quantity}, + #{unit}, + #{spare1}, + #{spare2}, + #{spare3}, + + + + + update bas_container_details + + container_id = #{containerId}, + product_id = #{productId}, + product_name = #{productName}, + quantity = #{quantity}, + unit = #{unit}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + + where id = #{id} + + + + delete from bas_container_details where id = #{id} + + + + delete from bas_container_details where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerMapper.xml new file mode 100644 index 0000000..5eb173b --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerMapper.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + select container_id, port_name, status, product_type_quantity, capacity, create_time, update_time, operation_man, spare1, spare2, spare3 from bas_container + + + + + + + + insert into bas_container + + container_id, + port_name, + status, + product_type_quantity, + capacity, + create_time, + + update_time, + operation_man, + spare1, + spare2, + spare3, + + + #{containerId}, + #{portName}, + #{status}, + #{productTypeQuantity}, + #{capacity}, + #{createTime}, + + GETDATE(), + #{operationMan}, + #{spare1}, + #{spare2}, + #{spare3}, + + + + + update bas_container + + port_name = #{portName}, + status = #{status}, + product_type_quantity = #{productTypeQuantity}, + capacity = #{capacity}, + create_time = #{createTime}, + update_time = GETDATE(), + operation_man = #{operationMan}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + + where container_id = #{containerId} + + + + delete from bas_container where container_id = #{containerId} + + + + delete from bas_container where container_id in + + #{containerId} + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasCustomerMapper.xml new file mode 100644 index 0000000..fb0f468 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasCustomerMapper.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, customer_no, customer_group_no, customer_name, simple_name, useable, remark, business_department, salesman, mnemonic_code, type, taxpayer_registration_number, organization, sup_customer, retail_investor, country, time_zone, data_format, contact_name, shipment, tax_category from bas_customer + + + + + + + + insert into bas_customer + + id, + customer_no, + customer_group_no, + customer_name, + simple_name, + useable, + remark, + business_department, + salesman, + mnemonic_code, + type, + taxpayer_registration_number, + organization, + sup_customer, + retail_investor, + country, + time_zone, + data_format, + contact_name, + shipment, + tax_category, + + + #{id}, + #{customerNo}, + #{customerGroupNo}, + #{customerName}, + #{simpleName}, + #{useable}, + #{remark}, + #{businessDepartment}, + #{salesman}, + #{mnemonicCode}, + #{type}, + #{taxpayerRegistrationNumber}, + #{organization}, + #{supCustomer}, + #{retailInvestor}, + #{country}, + #{timeZone}, + #{dataFormat}, + #{contactName}, + #{shipment}, + #{taxCategory}, + + + + + update bas_customer + + customer_no = #{customerNo}, + customer_group_no = #{customerGroupNo}, + customer_name = #{customerName}, + simple_name = #{simpleName}, + useable = #{useable}, + remark = #{remark}, + business_department = #{businessDepartment}, + salesman = #{salesman}, + mnemonic_code = #{mnemonicCode}, + type = #{type}, + taxpayer_registration_number = #{taxpayerRegistrationNumber}, + organization = #{organization}, + sup_customer = #{supCustomer}, + retail_investor = #{retailInvestor}, + country = #{country}, + time_zone = #{timeZone}, + data_format = #{dataFormat}, + contact_name = #{contactName}, + shipment = #{shipment}, + tax_category = #{taxCategory}, + + where id = #{id} + + + + delete from bas_customer where id = #{id} + + + + delete from bas_customer where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasJobIdMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasJobIdMapper.xml new file mode 100644 index 0000000..66c83fd --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasJobIdMapper.xml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, type, job_id, job_detail, stock_id, order_id, Exorder_id, job_id_R, job_detail_R, job_id_C, job_detail_C, temp_order_id, lot_no, stockin_id, stockin_detail_id, stockout_id, stockout_detail_id, plan_id, job_id_y, job_id_s from bas_job_id + + + + + + + + insert into bas_job_id + + id, + type, + job_id, + job_detail, + stock_id, + order_id, + Exorder_id, + job_id_R, + job_detail_R, + job_id_C, + job_detail_C, + temp_order_id, + lot_no, + stockin_id, + stockin_detail_id, + stockout_id, + stockout_detail_id, + plan_id, + job_id_y, + job_id_s, + + + #{id}, + #{type}, + #{jobId}, + #{jobDetail}, + #{stockId}, + #{orderId}, + #{exorderId}, + #{jobIdR}, + #{jobDetailR}, + #{jobIdC}, + #{jobDetailC}, + #{tempOrderId}, + #{lotNo}, + #{stockinId}, + #{stockinDetailId}, + #{stockoutId}, + #{stockoutDetailId}, + #{planId}, + #{jobIdY}, + #{jobIdS}, + + + + + update bas_job_id + + + job_id = #{jobId}, + job_detail = #{jobDetail}, + stock_id = #{stockId}, + order_id = #{orderId}, + Exorder_id = #{exorderId}, + job_id_R = #{jobIdR}, + job_detail_R = #{jobDetailR}, + job_id_C = #{jobIdC}, + job_detail_C = #{jobDetailC}, + temp_order_id = #{tempOrderId}, + lot_no = #{lotNo}, + stockin_id = #{stockinId}, + stockin_detail_id = #{stockinDetailId}, + stockout_id = #{stockoutId}, + stockout_detail_id = #{stockoutDetailId}, + plan_id = #{planId}, + job_id_y = #{jobIdY}, + job_id_s = #{jobIdS}, + + where type = #{type} + + + + delete from bas_job_id where id = #{id} + + + + delete from bas_job_id where id in + + #{id} + + + + + + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductCodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductCodeMapper.xml new file mode 100644 index 0000000..8ca0ed2 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductCodeMapper.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, model, color, serial, v, hz, ph, n_w, g_w, type, spare1, spare2, spare3, create_time, spare4, spare5, spare6 from bas_product_code + + + + + + + + insert into bas_product_code + + id, + model, + color, + serial, + v, + hz, + ph, + n_w, + g_w, + type, + spare1, + spare2, + spare3, + create_time, + spare4, + spare5, + spare6, + + + #{id}, + #{model}, + #{color}, + #{serial}, + #{v}, + #{hz}, + #{ph}, + #{nW}, + #{gW}, + #{type}, + #{spare1}, + #{spare2}, + #{spare3}, + #{createTime}, + #{spare4}, + #{spare5}, + #{spare6}, + + + + + update bas_product_code + + model = #{model}, + color = #{color}, + serial = #{serial}, + v = #{v}, + hz = #{hz}, + ph = #{ph}, + n_w = #{nW}, + g_w = #{gW}, + type = #{type}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + create_time = #{createTime}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + + where id = #{id} + + + + delete from bas_product_code where id = #{id} + + + + delete from bas_product_code where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductMapper.xml new file mode 100644 index 0000000..8c572db --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductMapper.xml @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from bas_product + + + + + + + + insert into bas_product + + product_guid, + product_id, + parent_id, + price, + cargo_no, + unit, + spec, + remark, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + product_name, + spare7, + spare8, + spare9, + spare10, + spare11, + spare12, + spare13, + spare14, + spare15, + spare16, + spare17, + spare18, + spare19, + spare20, + spare21, + spare22, + spare23, + spare24, + spare25, + spare26, + spare27, + spare28, + spare29, + spare30, + spare31, + spare32, + spare33, + spare34, + spare35, + spare36, + spare37, + spare38, + spare39, + + + #{productGuid}, + #{productId}, + #{parentId}, + #{price}, + #{cargoNo}, + #{unit}, + #{spec}, + #{remark}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{productName}, + #{spare7}, + #{spare8}, + #{spare9}, + #{spare10}, + #{spare11}, + #{spare12}, + #{spare13}, + #{spare14}, + #{spare15}, + #{spare16}, + #{spare17}, + #{spare18}, + #{spare19}, + #{spare20}, + #{spare21}, + #{spare22}, + #{spare23}, + #{spare24}, + #{spare25}, + #{spare26}, + #{spare27}, + #{spare28}, + #{spare29}, + #{spare30}, + #{spare31}, + #{spare32}, + #{spare33}, + #{spare34}, + #{spare35}, + #{spare36}, + #{spare37}, + #{spare38}, + #{spare39}, + + + + + update bas_product + + product_id = #{productId}, + parent_id = #{parentId}, + price = #{price}, + cargo_no = #{cargoNo}, + unit = #{unit}, + spec = #{spec}, + remark = #{remark}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + product_name = #{productName}, + spare7 = #{spare7}, + spare8 = #{spare8}, + spare9 = #{spare9}, + spare10 = #{spare10}, + spare11 = #{spare11}, + spare12 = #{spare12}, + spare13 = #{spare13}, + spare14 = #{spare14}, + spare15 = #{spare15}, + spare16 = #{spare16}, + spare17 = #{spare17}, + spare18 = #{spare18}, + spare19 = #{spare19}, + spare20 = #{spare20}, + spare21 = #{spare21}, + spare22 = #{spare22}, + spare23 = #{spare23}, + spare24 = #{spare24}, + spare25 = #{spare25}, + spare26 = #{spare26}, + spare27 = #{spare27}, + spare28 = #{spare28}, + spare29 = #{spare29}, + spare30 = #{spare30}, + spare31 = #{spare31}, + spare32 = #{spare32}, + spare33 = #{spare33}, + spare34 = #{spare34}, + spare35 = #{spare35}, + spare36 = #{spare36}, + spare37 = #{spare37}, + spare38 = #{spare38}, + spare39 = #{spare39}, + + where product_guid = #{productGuid} + + + + delete from bas_product where product_guid = #{productGuid} + + + + delete from bas_product where product_guid in + + #{productGuid} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortMapper.xml new file mode 100644 index 0000000..62ff058 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortMapper.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + select id, port_name, port_type, port_desc, create_man, create_time from bas_product_port + + + + + + + + insert into bas_product_port + + id, + port_name, + port_type, + port_desc, + create_man, + create_time, + + + #{id}, + #{portName}, + #{portType}, + #{portDesc}, + #{createMan}, + #{createTime}, + + + + + update bas_product_port + + port_name = #{portName}, + port_type = #{portType}, + port_desc = #{portDesc}, + create_man = #{createMan}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from bas_product_port where id = #{id} + + + + delete from bas_product_port where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortRelMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortRelMapper.xml new file mode 100644 index 0000000..7ee65be --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortRelMapper.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + select id, product_guid, product_id, port_id from bas_product_port_rel + + + + + + + + + + + + + + + + + + + + + + + + + select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name from bas_product + + + + + + + + + insert into bas_product_port_rel + + id, + product_guid, + product_id, + port_id, + + + #{id}, + #{productGuid}, + #{productId}, + #{portId}, + + + + + update bas_product_port_rel + + product_guid = #{productGuid}, + product_id = #{productId}, + port_id = #{portId}, + + where id = #{id} + + + + delete from bas_product_port_rel where id = #{id} + + + + delete from bas_product_port_rel where id in + + #{id} + + + + delete from bas_product_port_rel where port_id=#{portId} and product_id in + + #{productId} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasRoadwayMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasRoadwayMapper.xml new file mode 100644 index 0000000..875bfaf --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasRoadwayMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + select id, roadway_id, warehouse_id, roadway_name, device_id, in_locked, out_locked, in_locked2, out_locked2 from bas_roadway + + + + + + + + insert into bas_roadway + + id, + roadway_id, + warehouse_id, + roadway_name, + device_id, + in_locked, + out_locked, + in_locked2, + out_locked2, + + + #{id}, + #{roadwayId}, + #{warehouseId}, + #{roadwayName}, + #{deviceId}, + #{inLocked}, + #{outLocked}, + #{inLocked2}, + #{outLocked2}, + + + + + update bas_roadway + + roadway_id = #{roadwayId}, + warehouse_id = #{warehouseId}, + roadway_name = #{roadwayName}, + device_id = #{deviceId}, + in_locked = #{inLocked}, + out_locked = #{outLocked}, + in_locked2 = #{inLocked2}, + out_locked2 = #{outLocked2}, + + where id = #{id} + + + + delete from bas_roadway where id = #{id} + + + + delete from bas_roadway where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasSupplierMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasSupplierMapper.xml new file mode 100644 index 0000000..750d04c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasSupplierMapper.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, supplier_no, supplier_group_no, supplier_name, simple_name, useable, remark, supplier_arae, taxpayer_registration_number, country, time_zone, data_format, receiving_country, tax_category, legal_person, registered_capital, address, contact_name, contact_number from bas_supplier + + + + + + + + insert into bas_supplier + + id, + supplier_no, + supplier_group_no, + supplier_name, + simple_name, + useable, + remark, + supplier_arae, + taxpayer_registration_number, + country, + time_zone, + data_format, + receiving_country, + tax_category, + legal_person, + registered_capital, + address, + contact_name, + contact_number, + + + #{id}, + #{supplierNo}, + #{supplierGroupNo}, + #{supplierName}, + #{simpleName}, + #{useable}, + #{remark}, + #{supplierArae}, + #{taxpayerRegistrationNumber}, + #{country}, + #{timeZone}, + #{dataFormat}, + #{receivingCountry}, + #{taxCategory}, + #{legalPerson}, + #{registeredCapital}, + #{address}, + #{contactName}, + #{contactNumber}, + + + + + update bas_supplier + + supplier_no = #{supplierNo}, + supplier_group_no = #{supplierGroupNo}, + supplier_name = #{supplierName}, + simple_name = #{simpleName}, + useable = #{useable}, + remark = #{remark}, + supplier_arae = #{supplierArae}, + taxpayer_registration_number = #{taxpayerRegistrationNumber}, + country = #{country}, + time_zone = #{timeZone}, + data_format = #{dataFormat}, + receiving_country = #{receivingCountry}, + tax_category = #{taxCategory}, + legal_person = #{legalPerson}, + registered_capital = #{registeredCapital}, + address = #{address}, + contact_name = #{contactName}, + contact_number = #{contactNumber}, + + where id = #{id} + + + + delete from bas_supplier where id = #{id} + + + + delete from bas_supplier where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTagMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTagMapper.xml new file mode 100644 index 0000000..9aa802b --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTagMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + select id, ip, pick_add, tray_code, cur_num, send_completed, spare1, spare2, spare3 from bas_tag + + + + + + + + + insert into bas_tag + + ip, + pick_add, + tray_code, + cur_num, + send_completed, + spare1, + spare2, + spare3, + + + #{ip}, + #{pickAdd}, + #{trayCode}, + #{curNum}, + #{sendCompleted}, + #{spare1}, + #{spare2}, + #{spare3}, + + + + + update bas_tag + + ip = #{ip}, + pick_add = #{pickAdd}, + tray_code = #{trayCode}, + cur_num = #{curNum}, + send_completed = #{sendCompleted}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + + where id = #{id} + + + + delete from bas_tag where id = #{id} + + + + delete from bas_tag where id in + + #{id} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTaskNoMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTaskNoMapper.xml new file mode 100644 index 0000000..f7cd878 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTaskNoMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + select id, task_type, type_name, task_no, min_no, max_no + from bas_task_no + + + + + update bas_task_no + + task_type = #{taskType}, + type_name = #{typeName}, + task_no = #{taskNo}, + min_no = #{minNo}, + max_no = #{maxNo}, + + where id = #{id} + + + + + + update bas_task_no + set task_no=#{taskNo} + where id = #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeFormatMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeFormatMapper.xml new file mode 100644 index 0000000..dbe6897 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeFormatMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + select id, barcode_format, serial_rule, serial_example, remarks, min_num, max_num, create_time, update_time, spare1, spare2, spare3 from bas_traycode_format + + + + + + + + insert into bas_traycode_format + + id, + barcode_format, + serial_rule, + serial_example, + remarks, + min_num, + max_num, + create_time, + update_time, + spare1, + spare2, + spare3, + + + #{id}, + #{barcodeFormat}, + #{serialRule}, + #{serialExample}, + #{remarks}, + #{minNum}, + #{maxNum}, + #{createTime}, + #{updateTime}, + #{spare1}, + #{spare2}, + #{spare3}, + + + + + update bas_traycode_format + + barcode_format = #{barcodeFormat}, + serial_rule = #{serialRule}, + serial_example = #{serialExample}, + remarks = #{remarks}, + min_num = #{minNum}, + max_num = #{maxNum}, + create_time = #{createTime}, + update_time = #{updateTime}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + + where id = #{id} + + + + delete from bas_traycode_format where id = #{id} + + + + delete from bas_traycode_format where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeMapper.xml new file mode 100644 index 0000000..6a24c34 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + select bt.id, bt.format_id, bt.tray_code, bt.create_time, bt.update_time, bt.spare1, bt.spare2, bt.spare3,btf.remarks as format_name + from bas_traycode bt + left join bas_traycode_format btf on btf.id = bt.format_id + + + + + + + + + insert into bas_traycode + + id, + format_id, + tray_code, + create_time, + update_time, + spare1, + spare2, + spare3, + + + #{id}, + #{formatId}, + #{trayCode}, + #{createTime}, + #{updateTime}, + #{spare1}, + #{spare2}, + #{spare3}, + + + + insert into bas_traycode( format_id, tray_code) values + + ( + + #{item.formatId}, + #{item.trayCode} + ) + + + + + update bas_traycode + + format_id = #{formatId}, + tray_code = #{trayCode}, + create_time = #{createTime}, + update_time = #{updateTime}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + + where id = #{id} + + + + delete from bas_traycode where id = #{id} + + + + delete from bas_traycode where id in + + #{id} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasWarehousePortMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasWarehousePortMapper.xml new file mode 100644 index 0000000..84f77ad --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasWarehousePortMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + select id, warehouse_id, port_code, port_name, port_type from bas_warehouse_port + + + + + + + + insert into bas_warehouse_port + + id, + warehouse_id, + port_code, + port_name, + port_type, + + + #{id}, + #{warehouseId}, + #{portCode}, + #{portName}, + #{portType}, + + + + + update bas_warehouse_port + + warehouse_id = #{warehouseId}, + port_code = #{portCode}, + port_name = #{portName}, + port_type = #{portType}, + + where id = #{id} + + + + delete from bas_warehouse_port where id = #{id} + + + + delete from bas_warehouse_port where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml new file mode 100644 index 0000000..bba33c8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + bcs.cargo_space_id, + bcs.warehouse_id, + bcs.roadway_id, + bcs.cargo_area_id, + bcs.the_type, + bcs.the_type_name, + bcs.cargo_space_name, + bcs.the_platoon, + bcs.the_column, + bcs.the_floor, + bcs.status, + bcs.locked, + bcs.tray_code, + bcs.cargo_hight, + bcs.iss_double, + bcs.group_coding_no, + bcs.group_coding, + bcs.cargo_space_logo, + bcs.this_cargo_area, + bw.warehouse_name + from bas_cargo_space bcs + left join bas_warehouse bw on bcs.warehouse_id = bw.warehouse_id + + + + + + + + + insert into bas_cargo_space + + cargo_space_id, + warehouse_id, + roadway_id, + cargo_area_id, + the_type, + the_type_name, + cargo_space_name, + the_platoon, + the_column, + the_floor, + status, + locked, + tray_code, + cargo_hight, + iss_double, + group_coding_no, + group_coding, + cargo_space_logo, + this_cargo_area, + + + #{cargoSpaceId}, + #{warehouseId}, + #{roadwayId}, + #{cargoAreaId}, + #{theType}, + #{theTypeName}, + #{cargoSpaceName}, + #{thePlatoon}, + #{theColumn}, + #{theFloor}, + #{status}, + #{locked}, + #{trayCode}, + #{cargoHight}, + #{issDouble}, + #{groupCodingNo}, + #{groupCoding}, + #{cargoSpaceLogo}, + #{thisCargoArea}, + + + + + update bas_cargo_space + + warehouse_id = #{warehouseId}, + roadway_id = #{roadwayId}, + cargo_area_id = #{cargoAreaId}, + the_type = #{theType}, + the_type_name = #{theTypeName}, + cargo_space_name = #{cargoSpaceName}, + the_platoon = #{thePlatoon}, + the_column = #{theColumn}, + the_floor = #{theFloor}, + status = #{status}, + locked = #{locked}, + tray_code = #{trayCode}, + cargo_hight = #{cargoHight}, + iss_double = #{issDouble}, + group_coding_no = #{groupCodingNo}, + group_coding = #{groupCoding}, + cargo_space_logo = #{cargoSpaceLogo}, + this_cargo_area = #{thisCargoArea}, + + where cargo_space_id = #{cargoSpaceId} + + + + delete from bas_cargo_space where cargo_space_id = #{cargoSpaceId} + + + + delete from bas_cargo_space where cargo_space_id in + + #{cargoSpaceId} + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/warehouse/BasWarehouseMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/warehouse/BasWarehouseMapper.xml new file mode 100644 index 0000000..060f79e --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/warehouse/BasWarehouseMapper.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + select warehouse_id, warehouse_no, project_no, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current from bas_warehouse + + + + + + + + insert into bas_warehouse + + warehouse_id, + warehouse_no, + project_no, + warehouse_name, + address, + c_desc, + warehouse_kind, + warehouse_type, + is_current, + + + #{warehouseId}, + #{warehouseNo}, + #{projectNo}, + #{warehouseName}, + #{address}, + #{cDesc}, + #{warehouseKind}, + #{warehouseType}, + #{isCurrent}, + + + + + update bas_warehouse + + warehouse_no = #{warehouseNo}, + project_no = #{projectNo}, + warehouse_name = #{warehouseName}, + address = #{address}, + c_desc = #{cDesc}, + warehouse_kind = #{warehouseKind}, + warehouse_type = #{warehouseType}, + is_current = #{isCurrent}, + + where warehouse_id = #{warehouseId} + + + + delete from bas_warehouse where warehouse_id = #{warehouseId} + + + + delete from bas_warehouse where warehouse_id in + + #{warehouseId} + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckCommitRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckCommitRecordMapper.xml new file mode 100644 index 0000000..85a7fc8 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckCommitRecordMapper.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + select pd_guid, tray_code, stock_id, quantity, spare1, spare2, spare3 from check_commit_record + + + + + + + + insert into check_commit_record + + tray_code, + stock_id, + quantity, + spare1, + spare2, + spare3, + + + #{trayCode}, + #{stockId}, + #{quantity}, + #{spare1}, + #{spare2}, + #{spare3}, + + + + + update check_commit_record + + tray_code = #{trayCode}, + stock_id = #{stockId}, + quantity = #{quantity}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + + where pd_guid = #{pdGuid} + + + + delete from check_commit_record where pd_guid = #{pdGuid} + + + + delete from check_commit_record where pd_guid in + + #{pdGuid} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordFinishMapper.xml new file mode 100644 index 0000000..303fb5a --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordFinishMapper.xml @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select r.check_guid, + r.check_stock_detail_id, + r.stock_id, + r.tray_code, + r.cargo_space_id, + r.product_id, + r.lot_no, + r.supplier, + r.customer, + r.old_quantity, + r.new_quantity, + r.record_type, + r.create_time, + r.product_guid, + r.status, + r.warehouse_id, + w.warehouse_name, + bp.product_name, + bp.spare1 as englishDesc, + bp.spare2 as netWeight, + bp.spare5 as length, + bp.spare6 as width, + bp.spare7 as height, + bp.spare8 as volume, + bcs.cargo_space_name + from check_difference_record_finish r + left join bas_warehouse w on r.warehouse_id = w.warehouse_id + left join bas_product bp on r.product_id = bp.product_id + left join bas_cargo_space bcs on r.cargo_space_id = bcs.cargo_space_id + + + + + + + + insert into check_difference_record_finish + + check_guid, + check_stock_detail_id, + stock_id, + tray_code, + cargo_space_id, + product_id, + lot_no, + supplier, + customer, + old_quantity, + new_quantity, + record_type, + create_time, + product_guid, + status, + warehouse_id, + + + #{checkGuid}, + #{checkStockDetailId}, + #{stockId}, + #{trayCode}, + #{cargoSpaceId}, + #{productId}, + #{lotNo}, + #{supplier}, + #{customer}, + #{oldQuantity}, + #{newQuantity}, + #{recordType}, + #{createTime}, + #{productGuid}, + #{status}, + #{warehouseId}, + + + + + update check_difference_record_finish + + check_stock_detail_id = #{checkStockDetailId}, + stock_id = #{stockId}, + tray_code = #{trayCode}, + cargo_space_id = #{cargoSpaceId}, + product_id = #{productId}, + lot_no = #{lotNo}, + supplier = #{supplier}, + customer = #{customer}, + old_quantity = #{oldQuantity}, + new_quantity = #{newQuantity}, + record_type = #{recordType}, + create_time = #{createTime}, + product_guid = #{productGuid}, + status = #{status}, + warehouse_id = #{warehouseId}, + + where check_guid = #{checkGuid} + + + + delete + from check_difference_record_finish + where check_guid = #{checkGuid} + + + + delete from check_difference_record_finish where check_guid in + + #{checkGuid} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordMapper.xml new file mode 100644 index 0000000..d6fc4fc --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordMapper.xml @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select r.check_guid, + r.check_stock_detail_id, + r.stock_id, + r.tray_code, + r.cargo_space_id, + r.product_id, + r.lot_no, + r.supplier, + r.customer, + r.old_quantity, + r.new_quantity, + r.record_type, + r.create_time, + r.product_guid, + r.status, + r.warehouse_id, + w.warehouse_name, + bp.product_name, + bp.spare1 as englishDesc, + bp.spare2 as netWeight, + bp.spare5 as length, + bp.spare6 as width, + bp.spare7 as height, + bp.spare8 as volume, + bcs.cargo_space_name + from check_difference_record r + left join bas_warehouse w on r.warehouse_id = w.warehouse_id + left join bas_product bp on r.product_id = bp.product_id + left join bas_cargo_space bcs on r.cargo_space_id = bcs.cargo_space_id + + + + + + + + insert into check_difference_record + + check_guid, + check_stock_detail_id, + stock_id, + tray_code, + cargo_space_id, + product_id, + lot_no, + supplier, + customer, + old_quantity, + new_quantity, + record_type, + create_time, + product_guid, + status, + warehouse_id, + + + #{checkGuid}, + #{checkStockDetailId}, + #{stockId}, + #{trayCode}, + #{cargoSpaceId}, + #{productId}, + #{lotNo}, + #{supplier}, + #{customer}, + #{oldQuantity}, + #{newQuantity}, + #{recordType}, + #{createTime}, + #{productGuid}, + #{status}, + #{warehouseId}, + + + + + update check_difference_record + + check_stock_detail_id = #{checkStockDetailId}, + stock_id = #{stockId}, + tray_code = #{trayCode}, + cargo_space_id = #{cargoSpaceId}, + product_id = #{productId}, + lot_no = #{lotNo}, + supplier = #{supplier}, + customer = #{customer}, + old_quantity = #{oldQuantity}, + new_quantity = #{newQuantity}, + record_type = #{recordType}, + create_time = #{createTime}, + product_guid = #{productGuid}, + status = #{status}, + warehouse_id = #{warehouseId}, + + where check_guid = #{checkGuid} + + + + delete + from check_difference_record + where check_guid = #{checkGuid} + + + + delete from check_difference_record where check_guid in + + #{checkGuid} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailFinishMapper.xml new file mode 100644 index 0000000..1a61a5f --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailFinishMapper.xml @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id, + csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x, + csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec, + csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6, + bp.product_name, + bcs.cargo_space_name, + csd.spare7, + csd.spare8, + csd.spare9 + from check_stockin_detail_finish csd + left join bas_product bp on csd.product_id = bp.product_id + left join bas_cargo_space bcs on csd.cargo_space_id = bcs.cargo_space_id + + + + + select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from check_stockin_detail_finish + + + + + + + + + insert into check_stockin_detail_finish + + stock_check_detail_id, + stock_check_guid, + stock_check_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + price, + cargo_no, + remark, + assign_num, + assign_num_x, + assign_num_j, + print_date, + stock_status, + supplier_id, + customer_id, + unit, + spec, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + scan_num, + scan_num_x, + scan_num_j, + + + #{stockCheckDetailId}, + #{stockCheckGuid}, + #{stockCheckId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{price}, + #{cargoNo}, + #{remark}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{printDate}, + #{stockStatus}, + #{supplierId}, + #{customerId}, + #{unit}, + #{spec}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{scanNum}, + #{scanNumX}, + #{scanNumJ}, + + + + + update check_stockin_detail_finish + + stock_check_guid = #{stockCheckGuid}, + stock_check_id = #{stockCheckId}, + lot_no = #{lotNo}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + price = #{price}, + cargo_no = #{cargoNo}, + remark = #{remark}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + print_date = #{printDate}, + stock_status = #{stockStatus}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + unit = #{unit}, + spec = #{spec}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + scan_num = #{scanNum}, + scan_num_x = #{scanNumX}, + scan_num_j = #{scanNumJ}, + + where stock_check_detail_id = #{stockCheckDetailId} + + + + delete from check_stockin_detail_finish where stock_check_detail_id = #{stockCheckDetailId} + + + + delete from check_stockin_detail_finish where stock_check_detail_id in + + #{stockCheckDetailId} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailMapper.xml new file mode 100644 index 0000000..057a4e0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailMapper.xml @@ -0,0 +1,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id, + csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x, + csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec, + csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6, + bp.product_name, + bcs.cargo_space_name, + csd.spare7, + csd.spare8, + csd.spare9, + csd.order_id + from check_stockin_detail csd + left join bas_product bp on csd.product_id = bp.product_id + left join bas_cargo_space bcs on csd.cargo_space_id = bcs.cargo_space_id + + + + + + + + insert into check_stockin_detail + + stock_check_detail_id, + stock_check_guid, + stock_check_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + price, + cargo_no, + remark, + assign_num, + assign_num_x, + assign_num_j, + print_date, + stock_status, + supplier_id, + customer_id, + unit, + spec, + scan_num, + scan_num_x, + scan_num_j, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + cargo_space_id, + spare7, + spare8, + spare9, + order_id, + + + #{stockCheckDetailId}, + #{stockCheckGuid}, + #{stockCheckId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{price}, + #{cargoNo}, + #{remark}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{printDate}, + #{stockStatus}, + #{supplierId}, + #{customerId}, + #{unit}, + #{spec}, + #{scanNum}, + #{scanNumX}, + #{scanNumJ}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{cargoSpaceId}, + #{spare7}, + #{spare8}, + #{spare9}, + #{orderId}, + + + + insert into check_stockin_detail_finish + select * from check_stockin_detail where stock_check_id = #{stockCheckId} + + + + update check_stockin_detail + + stock_check_guid = #{stockCheckGuid}, + stock_check_id = #{stockCheckId}, + lot_no = #{lotNo}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + price = #{price}, + cargo_no = #{cargoNo}, + remark = #{remark}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + print_date = #{printDate}, + stock_status = #{stockStatus}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + unit = #{unit}, + spec = #{spec}, + scan_num = #{scanNum}, + scan_num_x = #{scanNumX}, + scan_num_j = #{scanNumJ}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + + where stock_check_detail_id = #{stockCheckDetailId} + + + + delete from check_stockin_detail where stock_check_detail_id = #{stockCheckDetailId} + + + + delete from check_stockin_detail where stock_check_detail_id in + + #{stockCheckDetailId} + + + + delete from check_stockin_detail where stock_check_guid = #{stockCheckGuid} + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinFinishMapper.xml new file mode 100644 index 0000000..675d421 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinFinishMapper.xml @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, csf.warehouse_id,warehouse_name, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 + from check_stockin_finish csf + left join bas_warehouse bw on bw.warehouse_id= csf.warehouse_id + + + select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from check_stockin_finish + + + + + + + + + insert into check_stockin_finish + + stock_guid, + stock_check_id, + check_type, + create_date, + create_man_id, + status, + warehouse_id, + spare5, + spare4, + spare3, + finish_date, + spare2, + spare1, + erp_bill, + stock_source, + department_no, + customer_no, + class_no, + supplier_no, + + + #{stockGuid}, + #{stockCheckId}, + #{checkType}, + #{createDate}, + #{createManId}, + #{status}, + #{warehouseId}, + #{spare5}, + #{spare4}, + #{spare3}, + #{finishDate}, + #{spare2}, + #{spare1}, + #{erpBill}, + #{stockSource}, + #{departmentNo}, + #{customerNo}, + #{classNo}, + #{supplierNo}, + + + + + update check_stockin_finish + + stock_check_id = #{stockCheckId}, + check_type = #{checkType}, + create_date = #{createDate}, + create_man_id = #{createManId}, + status = #{status}, + warehouse_id = #{warehouseId}, + spare5 = #{spare5}, + spare4 = #{spare4}, + spare3 = #{spare3}, + finish_date = #{finishDate}, + spare2 = #{spare2}, + spare1 = #{spare1}, + erp_bill = #{erpBill}, + stock_source = #{stockSource}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + class_no = #{classNo}, + supplier_no = #{supplierNo}, + + where stock_guid = #{stockGuid} + + + + delete from check_stockin_finish where stock_guid = #{stockGuid} + + + + delete from check_stockin_finish where stock_guid in + + #{stockGuid} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinMapper.xml new file mode 100644 index 0000000..7028bf3 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinMapper.xml @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select cs.stock_guid, + cs.stock_check_id, + cs.check_type, + cs.create_date, + cs.create_man_id, + cs.status, + cs.warehouse_id, + cs.finish_date, + cs.erp_bill, + cs.stock_source, + cs.department_no, + cs.customer_no, + cs.class_no, + cs.supplier_no, + cs.spare1, + cs.spare2, + cs.spare3, + cs.spare4, + cs.spare5, + bw.warehouse_name, + sd.dept_name as department_name + from check_stockin cs + left join bas_warehouse bw on cs.warehouse_id = bw.warehouse_id + left join sys_dept sd on cs.department_no = sd.dept_id + + + + + + + + + insert into check_stockin + + stock_guid, + stock_check_id, + check_type, + create_date, + create_man_id, + status, + warehouse_id, + finish_date, + erp_bill, + stock_source, + department_no, + customer_no, + class_no, + supplier_no, + spare1, + spare2, + spare3, + spare4, + spare5, + + + #{stockGuid}, + #{stockCheckId}, + #{checkType}, + #{createDate}, + #{createManId}, + #{status}, + #{warehouseId}, + #{finishDate}, + #{erpBill}, + #{stockSource}, + #{departmentNo}, + #{customerNo}, + #{classNo}, + #{supplierNo}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + + + + insert into check_stockin_finish + select * from check_stockin where stock_guid = #{stockGuid} + + + + update check_stockin + + stock_check_id = #{stockCheckId}, + check_type = #{checkType}, + create_date = #{createDate}, + create_man_id = #{createManId}, + status = #{status}, + warehouse_id = #{warehouseId}, + finish_date = #{finishDate}, + erp_bill = #{erpBill}, + stock_source = #{stockSource}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + class_no = #{classNo}, + supplier_no = #{supplierNo}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + + where stock_guid = #{stockGuid} + + + + delete from check_stockin where stock_guid = #{stockGuid} + + + + delete from check_stockin where stock_guid in + + #{stockGuid} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinBackMapper.xml new file mode 100644 index 0000000..52a7b9e --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinBackMapper.xml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, + spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, + customer_no, class_no, supplier_no,send_status,send_time,msg,company_short_name,account_set_no from in_stockin_back + + + + + + + + insert into in_stockin_back + + stockin_guid, + stockin_id, + in_type, + create_date, + create_man_id, + status, + warehouse_id, + spare5, + spare4, + spare3, + finish_date, + spare2, + spare1, + erp_bill, + stock_source, + department_no, + customer_no, + class_no, + supplier_no, + send_status, + send_time, + msg, + + + #{stockinGuid}, + #{stockinId}, + #{inType}, + #{createDate}, + #{createManId}, + #{status}, + #{warehouseId}, + #{spare5}, + #{spare4}, + #{spare3}, + #{finishDate}, + #{spare2}, + #{spare1}, + #{erpBill}, + #{stockSource}, + #{departmentNo}, + #{customerNo}, + #{classNo}, + #{supplierNo}, + #{sendStatus}, + #{sendTime}, + #{msg}, + + + + + insert into in_stockin_back + select * from in_stockin where stockin_guid = #{stockinGuid} + + + + update in_stockin_back + + stockin_id = #{stockinId}, + in_type = #{inType}, + create_date = #{createDate}, + create_man_id = #{createManId}, + status = #{status}, + warehouse_id = #{warehouseId}, + spare5 = #{spare5}, + spare4 = #{spare4}, + spare3 = #{spare3}, + finish_date = #{finishDate}, + spare2 = #{spare2}, + spare1 = #{spare1}, + erp_bill = #{erpBill}, + stock_source = #{stockSource}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + class_no = #{classNo}, + supplier_no = #{supplierNo}, + send_status = #{sendStatus}, + send_time = #{sendTime}, + msg = #{msg}, + + where stockin_guid = #{stockinGuid} + + + + delete from in_stockin_back where stockin_guid = #{stockinGuid} + + + + delete from in_stockin_back where stockin_guid in + + #{stockinGuid} + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailBackMapper.xml new file mode 100644 index 0000000..4a7495f --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailBackMapper.xml @@ -0,0 +1,300 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockin_detail_id, + stockin_guid, + stockin_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + price, + cargo_no, + remark, + assign_num, + assign_num_x, + assign_num_j, + print_date, + stock_status, + supplier_id, + customer_id, + unit, + spec, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + scan_num, + scan_num_x, + scan_num_j, + spare7, + spare8, + spare9, + product_name, + send_status, + send_time, + msg, + source_line_id, + bar_code, + is_batch_manage, + old_project_no + from in_stockin_detail_back + + + + + + + + insert into in_stockin_detail_back + + stockin_detail_id, + stockin_guid, + stockin_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + price, + cargo_no, + remark, + assign_num, + assign_num_x, + assign_num_j, + print_date, + stock_status, + supplier_id, + customer_id, + unit, + spec, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + scan_num, + scan_num_x, + scan_num_j, + spare7, + spare8, + spare9, + product_name, + send_status, + send_time, + msg, + + + #{stockinDetailId}, + #{stockinGuid}, + #{stockinId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{price}, + #{cargoNo}, + #{remark}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{printDate}, + #{stockStatus}, + #{supplierId}, + #{customerId}, + #{unit}, + #{spec}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{scanNum}, + #{scanNumX}, + #{scanNumJ}, + #{spare7}, + #{spare8}, + #{spare9}, + #{productName}, + #{sendStatus}, + #{sendTime}, + #{msg}, + + + + + + insert into in_stockin_detail_back + select * from in_stockin_detail where stockin_guid = #{stockinGuid} + + + + update in_stockin_detail_back + + stockin_guid = #{stockinGuid}, + + lot_no = #{lotNo}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + price = #{price}, + cargo_no = #{cargoNo}, + remark = #{remark}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + print_date = #{printDate}, + stock_status = #{stockStatus}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + unit = #{unit}, + spec = #{spec}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + scan_num = #{scanNum}, + scan_num_x = #{scanNumX}, + scan_num_j = #{scanNumJ}, + spare7 = #{spare7}, + spare8 = #{spare8}, + spare9 = #{spare9}, + product_name = #{productName}, + send_status = #{sendStatus}, + send_time = #{sendTime}, + msg = #{msg}, + + where stockin_id = #{stockinId} + + + + delete from in_stockin_detail_back where stockin_detail_id = #{stockinDetailId} + + + + delete from in_stockin_detail_back where stockin_detail_id in + + #{stockinDetailId} + + + + + INSERT INTO in_stockin_detail_back_finish + + SELECT * FROM in_stockin_detail_back + WHERE stockin_detail_id = #{item.stockinDetailId} + + + + + DELETE FROM in_stockin_detail_back + WHERE stockin_detail_id IN + + #{item.stockinDetailId} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailFinishMapper.xml new file mode 100644 index 0000000..dcf74ec --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailFinishMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid, + isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark, + isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status, + isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, + isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j, + isd.product_name, + isd.spare7,isd.spare8,isd.spare9 + from in_stockin_detail_finish isd + left join bas_product bp on bp.product_id = isd.product_id + + + + + + + + + insert into in_stockin_detail_finish + + stockin_detail_id, + stockin_guid, + stockin_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + price, + cargo_no, + remark, + assign_num, + assign_num_x, + assign_num_j, + print_date, + stock_status, + supplier_id, + customer_id, + unit, + spec, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + scan_num, + scan_num_x, + scan_num_j, + + + #{stockinDetailId}, + #{stockinGuid}, + #{stockinId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{price}, + #{cargoNo}, + #{remark}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{printDate}, + #{stockStatus}, + #{supplierId}, + #{customerId}, + #{unit}, + #{spec}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{scanNum}, + #{scanNumX}, + #{scanNumJ}, + + + + + update in_stockin_detail_finish + + stockin_guid = #{stockinGuid}, + stockin_id = #{stockinId}, + lot_no = #{lotNo}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + price = #{price}, + cargo_no = #{cargoNo}, + remark = #{remark}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + print_date = #{printDate}, + stock_status = #{stockStatus}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + unit = #{unit}, + spec = #{spec}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + scan_num = #{scanNum}, + scan_num_x = #{scanNumX}, + scan_num_j = #{scanNumJ}, + + where stockin_detail_id = #{stockinDetailId} + + + + delete from in_stockin_detail_finish where stockin_detail_id = #{stockinDetailId} + + + + delete from in_stockin_detail_finish where stockin_detail_id in + + #{stockinDetailId} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml new file mode 100644 index 0000000..f50bf8b --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml @@ -0,0 +1,347 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid, + isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark, + isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status, + isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, + isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j, + isd.product_name, + isd.spare7,isd.spare8,isd.spare9 + from in_stockin_detail isd + left join bas_product bp on bp.product_id = isd.product_id + + + + + + + + insert into in_stockin_detail + + stockin_detail_id, + stockin_guid, + stockin_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + price, + cargo_no, + remark, + assign_num, + assign_num_x, + assign_num_j, + print_date, + stock_status, + supplier_id, + customer_id, + unit, + spec, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + spare7, + spare8, + spare9, + + scan_num, + scan_num_x, + scan_num_j, + product_name, + source_line_id, + bar_code, + is_batch_manage, + old_project_no, + + + #{stockinDetailId}, + #{stockinGuid}, + #{stockinId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{price}, + #{cargoNo}, + #{remark}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{printDate}, + #{stockStatus}, + #{supplierId}, + #{customerId}, + #{unit}, + #{spec}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, + #{spare9}, + + #{scanNum}, + #{scanNumX}, + #{scanNumJ}, + #{productName}, + + #{sourceLineId}, + #{barCode}, + #{isBatchManage}, + #{oldProjectNo}, + + + + + INSERT INTO in_stockin_detail + + + stockin_detail_id, + stockin_guid, + stockin_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + price, + cargo_no, + remark, + assign_num, + assign_num_x, + assign_num_j, + print_date, + stock_status, + supplier_id, + customer_id, + unit, + spec, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + scan_num, + scan_num_x, + scan_num_j, + + + + VALUES + + + #{item.stockinDetailId}, + #{item.stockinGuid}, + #{item.stockinId}, + #{item.lotNo}, + #{item.productGuid}, + #{item.productId}, + #{item.quantity}, + #{item.quantityX}, + #{item.quantityJ}, + #{item.price}, + #{item.cargoNo}, + #{item.remark}, + #{item.assignNum}, + #{item.assignNumX}, + #{item.assignNumJ}, + #{item.printDate}, + #{item.stockStatus}, + #{item.supplierId}, + #{item.customerId}, + #{item.unit}, + #{item.spec}, + #{item.spare1}, + #{item.spare2}, + #{item.spare3}, + #{item.spare4}, + #{item.spare5}, + #{item.spare6}, + #{item.scanNum}, + #{item.scanNumX}, + #{item.scanNumJ}, + + + + + insert into in_stockin_detail_finish + select * from in_stockin_detail where stockin_guid = #{stockinGuid} + + + + update in_stockin_detail + + stockin_guid = #{stockinGuid}, + stockin_id = #{stockinId}, + lot_no = #{lotNo}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + price = #{price}, + cargo_no = #{cargoNo}, + remark = #{remark}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + print_date = #{printDate}, + stock_status = #{stockStatus}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + unit = #{unit}, + spec = #{spec}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + scan_num = #{scanNum}, + scan_num_x = #{scanNumX}, + scan_num_j = #{scanNumJ}, + product_name = #{productName}, + + where stockin_detail_id = #{stockinDetailId} + + + + delete from in_stockin_detail where stockin_detail_id = #{stockinDetailId} + + + + delete from in_stockin_detail where stockin_detail_id in + + #{stockinDetailId} + + + + delete from in_stockin_detail where stockin_guid = #{stockinGuid} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinFinishMapper.xml new file mode 100644 index 0000000..95b6a7e --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinFinishMapper.xml @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select is2.stockin_guid, + is2.stockin_id, + is2.in_type, + is2.create_date, + is2.create_man_id, + is2.status, + is2.warehouse_id, + is2.finish_date, + is2.erp_bill, + is2.stock_source, + is2.department_no, + is2.customer_no, + is2.class_no, + is2.supplier_no, + is2.spare1, + is2.spare2, + is2.spare4, + is2.spare3, + is2.spare5, + bw.warehouse_name +-- bs.supplier_name, +-- sd.dept_name , +-- su.user_name + from in_stockin_finish is2 + left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id +-- left join bas_supplier bs on bs.supplier_no = is2.supplier_no +-- left join sys_dept sd on is2.department_no = sd.dept_id +-- left join sys_user su on su.user_id = is2.create_man_id + + + + + + + + + + + + + insert into in_stockin_finish + + stockin_guid, + stockin_id, + in_type, + create_date, + create_man_id, + status, + warehouse_id, + finish_date, + erp_bill, + stock_source, + department_no, + customer_no, + class_no, + supplier_no, + spare1, + spare2, + spare3, + spare4, + spare5, + + + #{stockinGuid}, + #{stockinId}, + #{inType}, + #{createDate}, + #{createManId}, + #{status}, + #{warehouseId}, + #{finishDate}, + #{erpBill}, + #{stockSource}, + #{departmentNo}, + #{customerNo}, + #{classNo}, + #{supplierNo}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + + + + + update in_stockin_finish + + stockin_id = #{stockinId}, + in_type = #{inType}, + create_date = #{createDate}, + create_man_id = #{createManId}, + status = #{status}, + warehouse_id = #{warehouseId}, + finish_date = #{finishDate}, + erp_bill = #{erpBill}, + stock_source = #{stockSource}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + class_no = #{classNo}, + supplier_no = #{supplierNo}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + + where stockin_guid = #{stockinGuid} + + + + delete from in_stockin_finish where stockin_guid = #{stockinGuid} + + + + delete from in_stockin_finish where stockin_guid in + + #{stockinGuid} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinMapper.xml new file mode 100644 index 0000000..46bcaff --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinMapper.xml @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select is2.stockin_guid, + is2.stockin_id, + is2.in_type, + is2.create_date, + is2.create_man_id, + is2.status, + is2.warehouse_id, + is2.finish_date, + is2.erp_bill, + is2.stock_source, + is2.department_no, + is2.customer_no, + is2.class_no, + is2.supplier_no, + is2.spare1, + is2.spare2, + is2.spare4, + is2.spare3, + is2.spare5, + bw.warehouse_name + from in_stockin is2 + left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id +-- left join bas_supplier bs on bs.supplier_no = is2.supplier_no +-- left join sys_dept sd on is2.department_no = sd.dept_id +-- left join sys_user su on su.user_id = is2.create_man_id + + + + + + + + + + insert into in_stockin + + stockin_guid, + stockin_id, + in_type, + create_date, + create_man_id, + status, + warehouse_id, + finish_date, + erp_bill, + stock_source, + department_no, + customer_no, + class_no, + supplier_no, + spare1, + spare2, + spare4, + spare3, + spare5, + company_short_name, + account_set_no, + + + #{stockinGuid}, + #{stockinId}, + #{inType}, + #{createDate}, + #{createManId}, + #{status}, + #{warehouseId}, + #{finishDate}, + #{erpBill}, + #{stockSource}, + #{departmentNo}, + #{customerNo}, + #{classNo}, + #{supplierNo}, + #{spare1}, + #{spare2}, + #{spare4}, + #{spare3}, + #{spare5}, + #{companyShortName}, + #{accountSetNo}, + + + + insert into in_stockin_finish + select * from in_stockin where stockin_guid = #{stockinGuid} + + + + update in_stockin + + stockin_id = #{stockinId}, + in_type = #{inType}, + create_date = #{createDate}, + create_man_id = #{createManId}, + status = #{status}, + warehouse_id = #{warehouseId}, + finish_date = #{finishDate}, + erp_bill = #{erpBill}, + stock_source = #{stockSource}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + class_no = #{classNo}, + supplier_no = #{supplierNo}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare4 = #{spare4}, + spare3 = #{spare3}, + spare5 = #{spare5}, + company_short_name = #{companyShortName}, + account_set_no = #{accountSetNo}, + + where stockin_guid = #{stockinGuid} + + + + delete from in_stockin where stockin_guid = #{stockinGuid} + + + + delete from in_stockin where stockin_guid in + + #{stockinGuid} + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/TransferBillCallbackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/TransferBillCallbackMapper.xml new file mode 100644 index 0000000..52e9970 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/TransferBillCallbackMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + select id, job_id, erp_bill, type, status, create_time, finish_time, spare1, spare2, spare3 from transfer_bill_callback + + + + + + + + insert into transfer_bill_callback + + job_id, + erp_bill, + type, + status, + create_time, + finish_time, + spare1, + spare2, + spare3, + + + #{jobId}, + #{erpBill}, + #{type}, + #{status}, + #{createTime}, + #{finishTime}, + #{spare1}, + #{spare2}, + #{spare3}, + + + + + update transfer_bill_callback + + job_id = #{jobId}, + erp_bill = #{erpBill}, + type = #{type}, + status = #{status}, + create_time = #{createTime}, + finish_time = #{finishTime}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + + where id = #{id} + + + + delete from transfer_bill_callback where id = #{id} + + + + delete from transfer_bill_callback where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/BillStatusCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/BillStatusCountMapper.xml new file mode 100644 index 0000000..74cf270 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/index/BillStatusCountMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/CargoSpaceCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/CargoSpaceCountMapper.xml new file mode 100644 index 0000000..5263856 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/index/CargoSpaceCountMapper.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/IndexCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/IndexCountMapper.xml new file mode 100644 index 0000000..78a4fe9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/index/IndexCountMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/ViewIndexJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/ViewIndexJobMapper.xml new file mode 100644 index 0000000..11eb6df --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/index/ViewIndexJobMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/WeekJobCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/WeekJobCountMapper.xml new file mode 100644 index 0000000..4af7e81 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/index/WeekJobCountMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailFinishMapper.xml new file mode 100644 index 0000000..b055c22 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailFinishMapper.xml @@ -0,0 +1,302 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into mydo_job_detail_finish + + job_detail_id, + job_id, + stock_id, + lot_no, + in_date, + in_or_out_id, + in_or_out_d_id, + product_guid, + product_id, + stock_status, + in_quantity, + stock_quantity, + out_quantity, + layer_quantity, + out_layer_quantity, + give_num, + stockin_id, + stacking_id, + exit_id, + print_date, + customer_id, + supplier_id, + spare1, + spare2, + spare3, + spare4, + + + #{jobDetailId}, + #{jobId}, + #{stockId}, + #{lotNo}, + #{inDate}, + #{inOrOutId}, + #{inOrOutDId}, + #{productGuid}, + #{productId}, + #{stockStatus}, + #{inQuantity}, + #{stockQuantity}, + #{outQuantity}, + #{layerQuantity}, + #{outLayerQuantity}, + #{giveNum}, + #{stockinId}, + #{stackingId}, + #{exitId}, + #{printDate}, + #{customerId}, + #{supplierId}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + + + + + update mydo_job_detail_finish + + job_id = #{jobId}, + stock_id = #{stockId}, + lot_no = #{lotNo}, + in_date = #{inDate}, + in_or_out_id = #{inOrOutId}, + in_or_out_d_id = #{inOrOutDId}, + product_guid = #{productGuid}, + product_id = #{productId}, + stock_status = #{stockStatus}, + in_quantity = #{inQuantity}, + stock_quantity = #{stockQuantity}, + out_quantity = #{outQuantity}, + layer_quantity = #{layerQuantity}, + out_layer_quantity = #{outLayerQuantity}, + give_num = #{giveNum}, + stockin_id = #{stockinId}, + stacking_id = #{stackingId}, + exit_id = #{exitId}, + print_date = #{printDate}, + customer_id = #{customerId}, + supplier_id = #{supplierId}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + + where job_detail_id = #{jobDetailId} + + + + delete from mydo_job_detail_finish where job_detail_id = #{jobDetailId} + + + + delete from mydo_job_detail_finish where job_detail_id in + + #{jobDetailId} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailMapper.xml new file mode 100644 index 0000000..79de6fc --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailMapper.xml @@ -0,0 +1,426 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into mydo_job_detail + + job_detail_id, + job_id, + stock_id, + lot_no, + in_date, + in_or_out_id, + in_or_out_d_id, + product_guid, + product_id, + stock_status, + in_quantity, + stock_quantity, + out_quantity, + layer_quantity, + out_layer_quantity, + give_num, + stockin_id, + stacking_id, + exit_id, + print_date, + customer_id, + supplier_id, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + spare7, + spare8, + spare9, + spec, + unit, + pick_quantity, + + + #{jobDetailId}, + #{jobId}, + #{stockId}, + #{lotNo}, + #{inDate}, + #{inOrOutId}, + #{inOrOutDId}, + #{productGuid}, + #{productId}, + #{stockStatus}, + #{inQuantity}, + #{stockQuantity}, + #{outQuantity}, + #{layerQuantity}, + #{outLayerQuantity}, + #{giveNum}, + #{stockinId}, + #{stackingId}, + #{exitId}, + #{printDate}, + #{customerId}, + #{supplierId}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, + #{spare9}, + #{spec}, + #{unit}, + #{pick_quantity}, + + + + insert into mydo_job_detail_finish select * from mydo_job_detail where job_id = #{jobId} + + + + update mydo_job_detail + + job_id = #{jobId}, + stock_id = #{stockId}, + lot_no = #{lotNo}, + in_date = #{inDate}, + in_or_out_id = #{inOrOutId}, + in_or_out_d_id = #{inOrOutDId}, + product_guid = #{productGuid}, + product_id = #{productId}, + stock_status = #{stockStatus}, + in_quantity = #{inQuantity}, + stock_quantity = #{stockQuantity}, + out_quantity = #{outQuantity}, + layer_quantity = #{layerQuantity}, + out_layer_quantity = #{outLayerQuantity}, + give_num = #{giveNum}, + stockin_id = #{stockinId}, + stacking_id = #{stackingId}, + exit_id = #{exitId}, + print_date = #{printDate}, + customer_id = #{customerId}, + supplier_id = #{supplierId}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + pick_quantity = #{pickQuantity}, + + where job_detail_id = #{jobDetailId} + + + + delete from mydo_job_detail where job_detail_id = #{jobDetailId} + + + + delete from mydo_job_detail where job_detail_id in + + #{jobDetailId} + + + + delete from mydo_job_detail where job_id = #{jobId} + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobFinishMapper.xml new file mode 100644 index 0000000..6c88e70 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobFinishMapper.xml @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id, + mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id, + mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority, + mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id, + mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag, + bs.supplier_name as supplier_name, bc.customer_name as customer_name, + bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name, + bw.warehouse_name as warehouse_name,sd.dept_name + from mydo_job_finish mj + left join bas_supplier bs on mj.supplier_id = bs.id + left join bas_customer bc on mj.customer_id = bc.id + left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id + left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id + left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id + left join sys_dept sd on mj.department_id = sd.dept_id + + + + + + + + + + insert into mydo_job_finish + + job_id, + status, + on_line_type, + task_no, + supplier_id, + customer_id, + department_id, + tray_code, + roadway_id, + cargo_space_id, + target_roadway_id, + target_cargo_space_id, + line_id, + workshop_id, + priority, + execution_phase, + in_or_out, + create_time, + start_time, + finish_time, + entrance_id, + exit_id, + class_id, + warehouse_id, + fault_flag, + + + #{jobId}, + #{status}, + #{onLineType}, + #{taskNo}, + #{supplierId}, + #{customerId}, + #{departmentId}, + #{trayCode}, + #{roadwayId}, + #{cargoSpaceId}, + #{targetRoadwayId}, + #{targetCargoSpaceId}, + #{lineId}, + #{workshopId}, + #{priority}, + #{executionPhase}, + #{inOrOut}, + #{createTime}, + #{startTime}, + #{finishTime}, + #{entranceId}, + #{exitId}, + #{classId}, + #{warehouseId}, + #{faultFlag}, + + + + + update mydo_job_finish + + status = #{status}, + on_line_type = #{onLineType}, + task_no = #{taskNo}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + department_id = #{departmentId}, + tray_code = #{trayCode}, + roadway_id = #{roadwayId}, + cargo_space_id = #{cargoSpaceId}, + target_roadway_id = #{targetRoadwayId}, + target_cargo_space_id = #{targetCargoSpaceId}, + line_id = #{lineId}, + workshop_id = #{workshopId}, + priority = #{priority}, + execution_phase = #{executionPhase}, + in_or_out = #{inOrOut}, + create_time = #{createTime}, + start_time = #{startTime}, + finish_time = #{finishTime}, + entrance_id = #{entranceId}, + exit_id = #{exitId}, + class_id = #{classId}, + warehouse_id = #{warehouseId}, + fault_flag = #{faultFlag}, + + where job_id = #{jobId} + + + + delete from mydo_job_finish where job_id = #{jobId} + + + + delete from mydo_job_finish where job_id in + + #{jobId} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobMapper.xml new file mode 100644 index 0000000..f5d0891 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobMapper.xml @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id, + mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id, + mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority, + mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id, + mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag, + bs.supplier_name as supplier_name, bc.customer_name as customer_name, + bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name, + bw.warehouse_name as warehouse_name + from mydo_job mj + left join bas_supplier bs on mj.supplier_id = bs.id + left join bas_customer bc on mj.customer_id = bc.id + left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id + left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id + left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id + + + + + + + + + + insert into mydo_job + + job_id, + status, + on_line_type, + task_no, + supplier_id, + customer_id, + department_id, + tray_code, + roadway_id, + cargo_space_id, + target_roadway_id, + target_cargo_space_id, + line_id, + workshop_id, + priority, + execution_phase, + in_or_out, + create_time, + start_time, + finish_time, + entrance_id, + exit_id, + class_id, + warehouse_id, + fault_flag, + + + #{jobId}, + #{status}, + #{onLineType}, + #{taskNo}, + #{supplierId}, + #{customerId}, + #{departmentId}, + #{trayCode}, + #{roadwayId}, + #{cargoSpaceId}, + #{targetRoadwayId}, + #{targetCargoSpaceId}, + #{lineId}, + #{workshopId}, + #{priority}, + #{executionPhase}, + #{inOrOut}, + #{createTime}, + #{startTime}, + #{finishTime}, + #{entranceId}, + #{exitId}, + #{classId}, + #{warehouseId}, + #{faultFlag}, + + + + insert into mydo_job_finish + select * from mydo_job where job_id = #{jobId} + + + + update mydo_job + + status = #{status}, + on_line_type = #{onLineType}, + task_no = #{taskNo}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + department_id = #{departmentId}, + tray_code = #{trayCode}, + roadway_id = #{roadwayId}, + cargo_space_id = #{cargoSpaceId}, + target_roadway_id = #{targetRoadwayId}, + target_cargo_space_id = #{targetCargoSpaceId}, + line_id = #{lineId}, + workshop_id = #{workshopId}, + priority = #{priority}, + execution_phase = #{executionPhase}, + in_or_out = #{inOrOut}, + create_time = #{createTime}, + start_time = #{startTime}, + finish_time = #{finishTime}, + entrance_id = #{entranceId}, + exit_id = #{exitId}, + class_id = #{classId}, + warehouse_id = #{warehouseId}, + fault_flag = #{faultFlag}, + + where job_id = #{jobId} + + + + + delete from mydo_job where job_id = #{jobId} + + + + delete from mydo_job where job_id in + + #{jobId} + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/mp/UserlMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/mp/UserlMapper.xml new file mode 100644 index 0000000..df959ea --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/mp/UserlMapper.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutExceptionRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutExceptionRecordMapper.xml new file mode 100644 index 0000000..580156d --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutExceptionRecordMapper.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + select out_guid, warehouse_id, stock_id, tray_code, product_id, spare1, spare2, spare3 from out_exception_record + + + + + + + + insert into out_exception_record + + warehouse_id, + stock_id, + tray_code, + product_id, + spare1, + spare2, + spare3, + + + #{warehouseId}, + #{stockId}, + #{trayCode}, + #{productId}, + #{spare1}, + #{spare2}, + #{spare3}, + + + + + update out_exception_record + + warehouse_id = #{warehouseId}, + stock_id = #{stockId}, + tray_code = #{trayCode}, + product_id = #{productId}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + + where out_guid = #{outGuid} + + + + delete from out_exception_record where out_guid = #{outGuid} + + + + delete from out_exception_record where out_guid in + + #{outGuid} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutPickSubmitMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutPickSubmitMapper.xml new file mode 100644 index 0000000..eb17b7e --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutPickSubmitMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + select id, tray_code, job_id, job_detail_id, product_id, quantity, warehouse_id, exit_id, spare1, spare2, spare3 from out_pick_submit + + + + + + + + insert into out_pick_submit + + tray_code, + job_id, + job_detail_id, + product_id, + quantity, + warehouse_id, + exit_id, + spare1, + spare2, + spare3, + + + #{trayCode}, + #{jobId}, + #{jobDetailId}, + #{productId}, + #{quantity}, + #{warehouseId}, + #{exitId}, + #{spare1}, + #{spare2}, + #{spare3}, + + + + + update out_pick_submit + + tray_code = #{trayCode}, + job_id = #{jobId}, + job_detail_id = #{jobDetailId}, + product_id = #{productId}, + quantity = #{quantity}, + warehouse_id = #{warehouseId}, + exit_id = #{exitId}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + + where id = #{id} + + + + delete from out_pick_submit where id = #{id} + + + + delete from out_pick_submit where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutBackMapper.xml new file mode 100644 index 0000000..6cfc269 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutBackMapper.xml @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockout_guid, + stockout_id, + out_type, + create_date, + department_no, + customer_no, + create_man_id, + status, + stockout_source, + warehouse_id, + class_now_id, + exit_id, + car_number, + FID, + erp_stockout_id, + start_date, + finish_date, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + spare7, + spare8, + send_status, + send_time, + msg, + company_short_name, + account_set_no + from out_stockout_back + + + + + + + + + + insert into out_stockout_back + + stockout_guid, + stockout_id, + out_type, + create_date, + department_no, + customer_no, + create_man_id, + status, + stockout_source, + warehouse_id, + class_now_id, + exit_id, + car_number, + FID, + erp_stockout_id, + start_date, + finish_date, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + spare7, + spare8, + send_status, + send_time, + msg, + + + #{stockoutGuid}, + #{stockoutId}, + #{outType}, + #{createDate}, + #{departmentNo}, + #{customerNo}, + #{createManId}, + #{status}, + #{stockoutSource}, + #{warehouseId}, + #{classNowId}, + #{exitId}, + #{carNumber}, + #{FID}, + #{erpStockoutId}, + #{startDate}, + #{finishDate}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, + #{sendStatus}, + #{sendTime}, + #{msg}, + + + + + update out_stockout_back + + stockout_id = #{stockoutId}, + out_type = #{outType}, + create_date = #{createDate}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + create_man_id = #{createManId}, + status = #{status}, + stockout_source = #{stockoutSource}, + warehouse_id = #{warehouseId}, + class_now_id = #{classNowId}, + exit_id = #{exitId}, + car_number = #{carNumber}, + FID = #{FID}, + erp_stockout_id = #{erpStockoutId}, + start_date = #{startDate}, + finish_date = #{finishDate}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, + send_status = #{sendStatus}, + send_time = #{sendTime}, + msg = #{msg}, + + where stockout_guid = #{stockoutGuid} + + + + delete from out_stockout_back where stockout_guid = #{stockoutGuid} + + + + delete from out_stockout_back where stockout_guid in + + #{stockoutGuid} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailBackMapper.xml new file mode 100644 index 0000000..89dc8cc --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailBackMapper.xml @@ -0,0 +1,320 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockout_detail_id, + stockout_guid, + stockout_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + assign_num, + assign_num_x, + assign_num_j, + allot_quantity, + allot_quantity_x, + allot_quantity_j, + price, + remark, + warehouse_id, + out_id, + bukechai_quantity, + kechai_quantity, + entryid, + flat_quantity, + fid, + erp_stockout_id, + unit, + spec, + product_name, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + spare7, + spare8, + spare9, + send_status, + send_time, + msg, + source_line_id, + bar_code, + is_batch_manage, + old_project_no + from out_stockout_detail_back + + + + + + + + insert into out_stockout_detail_back + + stockout_detail_id, + stockout_guid, + stockout_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + assign_num, + assign_num_x, + assign_num_j, + allot_quantity, + allot_quantity_x, + allot_quantity_j, + price, + remark, + warehouse_id, + out_id, + bukechai_quantity, + kechai_quantity, + entryid, + flat_quantity, + fid, + erp_stockout_id, + unit, + spec, + product_name, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + spare7, + spare8, + spare9, + send_status, + send_time, + msg, + + + #{stockoutDetailId}, + #{stockoutGuid}, + #{stockoutId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{allotQuantity}, + #{allotQuantityX}, + #{allotQuantityJ}, + #{price}, + #{remark}, + #{warehouseId}, + #{outId}, + #{bukechaiQuantity}, + #{kechaiQuantity}, + #{entryid}, + #{flatQuantity}, + #{fid}, + #{erpStockoutId}, + #{unit}, + #{spec}, + #{productName}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, + #{spare9}, + #{sendStatus}, + #{sendTime}, + #{msg}, + + + + + update out_stockout_detail_back + + stockout_guid = #{stockoutGuid}, + lot_no = #{lotNo}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + allot_quantity = #{allotQuantity}, + allot_quantity_x = #{allotQuantityX}, + allot_quantity_j = #{allotQuantityJ}, + price = #{price}, + remark = #{remark}, + warehouse_id = #{warehouseId}, + out_id = #{outId}, + bukechai_quantity = #{bukechaiQuantity}, + kechai_quantity = #{kechaiQuantity}, + entryid = #{entryid}, + flat_quantity = #{flatQuantity}, + fid = #{fid}, + erp_stockout_id = #{erpStockoutId}, + unit = #{unit}, + spec = #{spec}, + product_name = #{productName}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, + spare9 = #{spare9}, + send_status = #{sendStatus}, + send_time = #{sendTime}, + msg = #{msg}, + + where stockout_id = #{stockoutId} + + + + delete + from out_stockout_detail_back + where stockout_detail_id = #{stockoutDetailId} + + + + delete from out_stockout_detail_back where stockout_detail_id in + + #{stockoutDetailId} + + + + + INSERT INTO out_stockout_detail_back_finish + + SELECT * FROM out_stockout_detail_back + WHERE stockout_detail_id = #{item.stockoutDetailId} + + + + + DELETE FROM out_stockout_detail_back + WHERE stockout_detail_id IN + + #{item.stockoutDetailId} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailFinishMapper.xml new file mode 100644 index 0000000..1ccd669 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailFinishMapper.xml @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockout_detail_id, stockout_guid, stockout_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, allot_quantity, allot_quantity_x, allot_quantity_j, price, remark, warehouse_id, out_id, bukechai_quantity, kechai_quantity, entryid, flat_quantity, fid, erp_stockout_id, unit, spec, product_name, supplier_id, cargo_no, create_time, print_date from out_stockout_detail_finish + + + + + + + + insert into out_stockout_detail_finish + + stockout_detail_id, + stockout_guid, + stockout_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + assign_num, + assign_num_x, + assign_num_j, + allot_quantity, + allot_quantity_x, + allot_quantity_j, + price, + remark, + warehouse_id, + out_id, + bukechai_quantity, + kechai_quantity, + entryid, + flat_quantity, + fid, + erp_stockout_id, + unit, + spec, + product_name, + supplier_id, + cargo_no, + create_time, + print_date, + + + #{stockoutDetailId}, + #{stockoutGuid}, + #{stockoutId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{allotQuantity}, + #{allotQuantityX}, + #{allotQuantityJ}, + #{price}, + #{remark}, + #{warehouseId}, + #{outId}, + #{bukechaiQuantity}, + #{kechaiQuantity}, + #{entryid}, + #{flatQuantity}, + #{fid}, + #{erpStockoutId}, + #{unit}, + #{spec}, + #{productName}, + #{supplierId}, + #{cargoNo}, + #{createTime}, + #{printDate}, + + + + + update out_stockout_detail_finish + + stockout_guid = #{stockoutGuid}, + stockout_id = #{stockoutId}, + lot_no = #{lotNo}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + allot_quantity = #{allotQuantity}, + allot_quantity_x = #{allotQuantityX}, + allot_quantity_j = #{allotQuantityJ}, + price = #{price}, + remark = #{remark}, + warehouse_id = #{warehouseId}, + out_id = #{outId}, + bukechai_quantity = #{bukechaiQuantity}, + kechai_quantity = #{kechaiQuantity}, + entryid = #{entryid}, + flat_quantity = #{flatQuantity}, + fid = #{fid}, + erp_stockout_id = #{erpStockoutId}, + unit = #{unit}, + spec = #{spec}, + product_name = #{productName}, + supplier_id = #{supplierId}, + cargo_no = #{cargoNo}, + create_time = #{createTime}, + print_date = #{printDate}, + + where stockout_detail_id = #{stockoutDetailId} + + + + delete from out_stockout_detail_finish where stockout_detail_id = #{stockoutDetailId} + + + + delete from out_stockout_detail_finish where stockout_detail_id in + + #{stockoutDetailId} + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailMapper.xml new file mode 100644 index 0000000..a56d66c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailMapper.xml @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x, + d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j, + d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid, + d.erp_stockout_id, d.unit, d.spec, + d.product_name ,d.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9 + from out_stockout_detail d + + + + + + + + insert into out_stockout_detail + + stockout_detail_id, + stockout_guid, + stockout_id, + lot_no, + product_guid, + product_id, + product_name, + quantity, + quantity_x, + quantity_j, + assign_num, + assign_num_x, + assign_num_j, + allot_quantity, + allot_quantity_x, + allot_quantity_j, + price, + remark, + warehouse_id, + out_id, + bukechai_quantity, + kechai_quantity, + entryid, + flat_quantity, + fid, + erp_stockout_id, + unit, + spec, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + spare7, + spare8, + spare9, + source_line_id, + bar_code, + is_batch_manage, + old_project_no, + + + + #{stockoutDetailId}, + #{stockoutGuid}, + #{stockoutId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{productName}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{allotQuantity}, + #{allotQuantityX}, + #{allotQuantityJ}, + #{price}, + #{remark}, + #{warehouseId}, + #{outId}, + #{bukechaiQuantity}, + #{kechaiQuantity}, + #{entryid}, + #{flatQuantity}, + #{fid}, + #{erpStockoutId}, + #{unit}, + #{spec}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, + #{spare9}, + #{sourceLineId}, + #{barCode}, + #{isBatchManage}, + #{oldProjectNo}, + + + + + update out_stockout_detail + + stockout_guid = #{stockoutGuid}, + stockout_id = #{stockoutId}, + lot_no = #{lotNo}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + allot_quantity = #{allotQuantity}, + allot_quantity_x = #{allotQuantityX}, + allot_quantity_j = #{allotQuantityJ}, + price = #{price}, + remark = #{remark}, + warehouse_id = #{warehouseId}, + out_id = #{outId}, + bukechai_quantity = #{bukechaiQuantity}, + kechai_quantity = #{kechaiQuantity}, + entryid = #{entryid}, + flat_quantity = #{flatQuantity}, + fid = #{fid}, + erp_stockout_id = #{erpStockoutId}, + unit = #{unit}, + spec = #{spec}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, + spare9 = #{spare9}, + + + where stockout_detail_id = #{stockoutDetailId} + + + + delete from out_stockout_detail where stockout_detail_id = #{stockoutDetailId} + + + + delete from out_stockout_detail where stockout_detail_id in + + #{stockoutDetailId} + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutFinishMapper.xml new file mode 100644 index 0000000..ec19b6e --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutFinishMapper.xml @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id, start_date, finish_date from out_stockout_finish + + + + + + + + insert into out_stockout_finish + + stockout_guid, + stockout_id, + out_type, + create_date, + department_no, + customer_no, + create_man_id, + status, + stockout_source, + warehouse_id, + class_now_id, + exit_id, + car_number, + FID, + erp_stockout_id, + start_date, + finish_date, + + + #{stockoutGuid}, + #{stockoutId}, + #{outType}, + #{createDate}, + #{departmentNo}, + #{customerNo}, + #{createManId}, + #{status}, + #{stockoutSource}, + #{warehouseId}, + #{classNowId}, + #{exitId}, + #{carNumber}, + #{FID}, + #{erpStockoutId}, + #{startDate}, + #{finishDate}, + + + + + update out_stockout_finish + + stockout_id = #{stockoutId}, + out_type = #{outType}, + create_date = #{createDate}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + create_man_id = #{createManId}, + status = #{status}, + stockout_source = #{stockoutSource}, + warehouse_id = #{warehouseId}, + class_now_id = #{classNowId}, + exit_id = #{exitId}, + car_number = #{carNumber}, + FID = #{FID}, + erp_stockout_id = #{erpStockoutId}, + start_date = #{startDate}, + finish_date = #{finishDate}, + + where stockout_guid = #{stockoutGuid} + + + + delete from out_stockout_finish where stockout_guid = #{stockoutGuid} + + + + delete from out_stockout_finish where stockout_guid in + + #{stockoutGuid} + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutMapper.xml new file mode 100644 index 0000000..58b314c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutMapper.xml @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id,start_date,finish_date,spare1,spare2,spare3,spare4,spare5,spare6,spare7,spare8 from out_stockout + + + + + + + + insert into out_stockout + + stockout_guid, + stockout_id, + out_type, + create_date, + department_no, + customer_no, + create_man_id, + status, + stockout_source, + warehouse_id, + class_now_id, + exit_id, + car_number, + FID, + erp_stockout_id, + spare1, + spare2, + spare4, + spare3, + spare5, + spare6, + spare7, + spare8, + company_short_name, + account_set_no, + + + #{stockoutGuid}, + #{stockoutId}, + #{outType}, + #{createDate}, + #{departmentNo}, + #{customerNo}, + #{createManId}, + #{status}, + #{stockoutSource}, + #{warehouseId}, + #{classNowId}, + #{exitId}, + #{carNumber}, + #{FID}, + #{erpStockoutId}, + #{spare1}, + #{spare2}, + #{spare4}, + #{spare3}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, + #{companyShortName}, + #{accountSetNo}, + + + + + update out_stockout + + stockout_id = #{stockoutId}, + out_type = #{outType}, + create_date = #{createDate}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + create_man_id = #{createManId}, + status = #{status}, + stockout_source = #{stockoutSource}, + warehouse_id = #{warehouseId}, + class_now_id = #{classNowId}, + exit_id = #{exitId}, + car_number = #{carNumber}, + FID = #{FID}, + erp_stockout_id = #{erpStockoutId}, + start_date = #{startDate}, + finish_date = #{finishDate}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare4 = #{spare4}, + spare3 = #{spare3}, + spare5 = #{spare5}, + company_short_name = #{companyShortName}, + account_set_no = #{accountSetNo}, + + where stockout_id = #{stockoutId} + + + + delete from out_stockout where stockout_guid = #{stockoutGuid} + + + + delete from out_stockout where stockout_guid in + + #{stockoutGuid} + + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/ViewHandAllotStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/ViewHandAllotStockMapper.xml new file mode 100644 index 0000000..f1db0d0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/ViewHandAllotStockMapper.xml @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name, roadway_id, the_platoon, the_column, the_floor, status, locked from view_hand_allot_stock + + + + + + + + insert into view_hand_allot_stock + + stock_id, + cargo_space_id, + stock_status, + product_status, + lot_no, + in_date, + back_date, + product_guid, + quantity, + job_id, + tray_code, + out_quantity, + stockin_detail_id, + stockin_id, + in_type, + in_class_id, + warehouse_id, + stacking_id, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + product_id, + product_name, + voltage, + power, + phase, + net_weight, + gross_weight, + distribution, + model, + order_id, + spare7, + spare8, + cargo_space_name, + roadway_id, + the_platoon, + the_column, + the_floor, + status, + locked, + + + #{stockId}, + #{cargoSpaceId}, + #{stockStatus}, + #{productStatus}, + #{lotNo}, + #{inDate}, + #{backDate}, + #{productGuid}, + #{quantity}, + #{jobId}, + #{trayCode}, + #{outQuantity}, + #{stockinDetailId}, + #{stockinId}, + #{inType}, + #{inClassId}, + #{warehouseId}, + #{stackingId}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{productId}, + #{productName}, + #{voltage}, + #{power}, + #{phase}, + #{netWeight}, + #{grossWeight}, + #{distribution}, + #{model}, + #{orderId}, + #{spare7}, + #{spare8}, + #{cargoSpaceName}, + #{roadwayId}, + #{thePlatoon}, + #{theColumn}, + #{theFloor}, + #{status}, + #{locked}, + + + + + update view_hand_allot_stock + + cargo_space_id = #{cargoSpaceId}, + stock_status = #{stockStatus}, + product_status = #{productStatus}, + lot_no = #{lotNo}, + in_date = #{inDate}, + back_date = #{backDate}, + product_guid = #{productGuid}, + quantity = #{quantity}, + job_id = #{jobId}, + tray_code = #{trayCode}, + out_quantity = #{outQuantity}, + stockin_detail_id = #{stockinDetailId}, + stockin_id = #{stockinId}, + in_type = #{inType}, + in_class_id = #{inClassId}, + warehouse_id = #{warehouseId}, + stacking_id = #{stackingId}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + product_id = #{productId}, + product_name = #{productName}, + voltage = #{voltage}, + power = #{power}, + phase = #{phase}, + net_weight = #{netWeight}, + gross_weight = #{grossWeight}, + distribution = #{distribution}, + model = #{model}, + order_id = #{orderId}, + spare7 = #{spare7}, + spare8 = #{spare8}, + cargo_space_name = #{cargoSpaceName}, + roadway_id = #{roadwayId}, + the_platoon = #{thePlatoon}, + the_column = #{theColumn}, + the_floor = #{theFloor}, + status = #{status}, + locked = #{locked}, + + where stock_id = #{stockId} + + + + delete from view_hand_allot_stock where stock_id = #{stockId} + + + + delete from view_hand_allot_stock where stock_id in + + #{stockId} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml new file mode 100644 index 0000000..58b2a9c --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/pda/TrayMsgMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/pda/TrayMsgMapper.xml new file mode 100644 index 0000000..746fdd9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/pda/TrayMsgMapper.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + select id, tray_code, stockin_detail_id, quantity,warehouse_id from tray_msg + + + + + + + + insert into tray_msg + + id, + tray_code, + stockin_detail_id, + quantity, + warehouse_id, + + + #{id}, + #{trayCode}, + #{stockinDetailId}, + #{quantity}, + #{warehouseId}, + + + + + update tray_msg + + tray_code = #{trayCode}, + stockin_detail_id = #{stockinDetailId}, + quantity = #{quantity}, + + where id = #{id} + + + + delete from tray_msg where id = #{id} + + + + delete from tray_msg where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/productAndStock/ViewProductAndStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/productAndStock/ViewProductAndStockMapper.xml new file mode 100644 index 0000000..7cf3c89 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/productAndStock/ViewProductAndStockMapper.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock + + + select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock_pd + + + + + + + + + insert into view_product_and_stock + + only_identity, + product_id, + lot_no, + product_name, + quantity, + warehouse_id, + stacking_id, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + voltage, + power, + phase, + + + #{onlyIdentity}, + #{productId}, + #{lotNo}, + #{productName}, + #{quantity}, + #{warehouseId}, + #{stackingId}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{voltage}, + #{power}, + #{phase}, + + + + + update view_product_and_stock + + product_id = #{productId}, + lot_no = #{lotNo}, + product_name = #{productName}, + quantity = #{quantity}, + warehouse_id = #{warehouseId}, + stacking_id = #{stackingId}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + voltage = #{voltage}, + power = #{power}, + phase = #{phase}, + + where only_identity = #{onlyIdentity} + + + + delete from view_product_and_stock where only_identity = #{onlyIdentity} + + + + delete from view_product_and_stock where only_identity in + + #{onlyIdentity} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailFinishMapper.xml new file mode 100644 index 0000000..f57ee75 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailFinishMapper.xml @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select rsd.stockin_detail_id, rsd.stockin_guid, rsd.stockin_id, rsd.lot_no, rsd.product_guid, rsd.product_id, + rsd.quantity, rsd.quantity_x, rsd.quantity_j, rsd.price, rsd.cargo_no, rsd.remark, rsd.assign_num, + rsd.assign_num_x, rsd.assign_num_j, rsd.print_date, rsd.stock_status, rsd.supplier_id, rsd.customer_id, + rsd.unit, rsd.spec, rsd.spare1, rsd.spare2, rsd.spare3, rsd.spare4, rsd.spare5, rsd.spare6, + bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + from receive_stockin_detail_finish rsd + left join bas_product bp on rsd.product_id = bp.product_id + + + + + + + + + insert into receive_stockin_detail_finish + + stockin_detail_id, + stockin_guid, + stockin_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + price, + cargo_no, + remark, + assign_num, + assign_num_x, + assign_num_j, + print_date, + stock_status, + supplier_id, + customer_id, + unit, + spec, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + + + #{stockinDetailId}, + #{stockinGuid}, + #{stockinId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{price}, + #{cargoNo}, + #{remark}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{printDate}, + #{stockStatus}, + #{supplierId}, + #{customerId}, + #{unit}, + #{spec}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + + + + + update receive_stockin_detail_finish + + stockin_guid = #{stockinGuid}, + stockin_id = #{stockinId}, + lot_no = #{lotNo}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + price = #{price}, + cargo_no = #{cargoNo}, + remark = #{remark}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + print_date = #{printDate}, + stock_status = #{stockStatus}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + unit = #{unit}, + spec = #{spec}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + + where stockin_detail_id = #{stockinDetailId} + + + + delete from receive_stockin_detail_finish where stockin_detail_id = #{stockinDetailId} + + + + delete from receive_stockin_detail_finish where stockin_detail_id in + + #{stockinDetailId} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailMapper.xml new file mode 100644 index 0000000..6790d91 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailMapper.xml @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select rsd.stockin_detail_id, rsd.stockin_guid, rsd.stockin_id, rsd.lot_no, rsd.product_guid, rsd.product_id, + rsd.quantity, rsd.quantity_x, rsd.quantity_j, rsd.price, rsd.cargo_no, rsd.remark, rsd.assign_num, + rsd.assign_num_x, rsd.assign_num_j, rsd.print_date, rsd.stock_status, rsd.supplier_id, rsd.customer_id, + rsd.unit, rsd.spec, rsd.spare1, rsd.spare2, rsd.spare3, rsd.spare4, rsd.spare5, rsd.spare6, + bp.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + from receive_stockin_detail rsd + left join bas_product bp on rsd.product_id = bp.product_id + + + + + + + + insert into receive_stockin_detail + + stockin_detail_id, + stockin_guid, + stockin_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + price, + cargo_no, + remark, + assign_num, + assign_num_x, + assign_num_j, + print_date, + stock_status, + supplier_id, + customer_id, + unit, + spec, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + + + #{stockinDetailId}, + #{stockinGuid}, + #{stockinId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{price}, + #{cargoNo}, + #{remark}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{printDate}, + #{stockStatus}, + #{supplierId}, + #{customerId}, + #{unit}, + #{spec}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + + + + insert into receive_stockin_detail_finish + select * from receive_stockin_detail where stockin_guid = #{receiveStockinGuid} + + + + update receive_stockin_detail + + stockin_guid = #{stockinGuid}, + stockin_id = #{stockinId}, + lot_no = #{lotNo}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_x = #{quantityX}, + quantity_j = #{quantityJ}, + price = #{price}, + cargo_no = #{cargoNo}, + remark = #{remark}, + assign_num = #{assignNum}, + assign_num_x = #{assignNumX}, + assign_num_j = #{assignNumJ}, + print_date = #{printDate}, + stock_status = #{stockStatus}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + unit = #{unit}, + spec = #{spec}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + + where stockin_detail_id = #{stockinDetailId} + + + + delete from receive_stockin_detail where stockin_detail_id = #{stockinDetailId} + + + + delete from receive_stockin_detail where stockin_detail_id in + + #{stockinDetailId} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinFinishMapper.xml new file mode 100644 index 0000000..7acb93b --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinFinishMapper.xml @@ -0,0 +1,237 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + rs.stockin_guid , + rs.stockin_id , + rs.in_type , + rs.create_date , + rs.create_man_id , + rs.status , + rs.warehouse_id , + bw.warehouse_name , + rs.spare5 , + rs.spare4 , + rs.spare3 , + rs.finish_date , + rs.spare2 , + rs.spare1, + rs.erp_bill , + rs.stock_source, + rs.department_no, + rs.customer_no, + rs.class_no, + rs.supplier_no, + bs.supplier_name, + sd.dept_name, + su.user_name + from receive_stockin_finish rs + left join bas_warehouse bw on rs.warehouse_id = bw.warehouse_id + left join bas_supplier bs on rs.supplier_no = bs.supplier_no + left join sys_dept sd on rs.department_no = sd.dept_id + left join sys_user su on su.user_id = rs.create_man_id + + + + + + + + + insert into receive_stockin_finish + + stockin_guid, + stockin_id, + in_type, + create_date, + create_man_id, + status, + warehouse_id, + spare5, + spare4, + spare3, + finish_date, + spare2, + spare1, + erp_bill, + stock_source, + department_no, + customer_no, + class_no, + supplier_no, + + + #{stockinGuid}, + #{stockinId}, + #{inType}, + #{createDate}, + #{createManId}, + #{status}, + #{warehouseId}, + #{spare5}, + #{spare4}, + #{spare3}, + #{finishDate}, + #{spare2}, + #{spare1}, + #{erpBill}, + #{stockSource}, + #{departmentNo}, + #{customerNo}, + #{classNo}, + #{supplierNo}, + + + + + update receive_stockin_finish + + stockin_id = #{stockinId}, + in_type = #{inType}, + create_date = #{createDate}, + create_man_id = #{createManId}, + status = #{status}, + warehouse_id = #{warehouseId}, + spare5 = #{spare5}, + spare4 = #{spare4}, + spare3 = #{spare3}, + finish_date = #{finishDate}, + spare2 = #{spare2}, + spare1 = #{spare1}, + erp_bill = #{erpBill}, + stock_source = #{stockSource}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + class_no = #{classNo}, + supplier_no = #{supplierNo}, + + where stockin_guid = #{stockinGuid} + + + + delete from receive_stockin_finish where stockin_guid = #{stockinGuid} + + + + delete from receive_stockin_finish where stockin_guid in + + #{stockinGuid} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinMapper.xml new file mode 100644 index 0000000..bd93721 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinMapper.xml @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + rs.stockin_guid , + rs.stockin_id , + rs.in_type , + rs.create_date , + rs.create_man_id , + rs.status , + rs.warehouse_id , + bw.warehouse_name , + rs.spare5 , + rs.spare4 , + rs.spare3 , + rs.finish_date , + rs.spare2 , + rs.spare1, + rs.erp_bill , + rs.stock_source, + rs.department_no, + rs.customer_no, + rs.class_no, + rs.supplier_no, + bs.supplier_name, + sd.dept_name, + su.user_name + from receive_stockin rs + left join bas_warehouse bw on rs.warehouse_id = bw.warehouse_id + left join bas_supplier bs on rs.supplier_no = bs.supplier_no + left join sys_dept sd on rs.department_no = sd.dept_id + left join sys_user su on su.user_id = rs.create_man_id + + + + + + + + + insert into receive_stockin + + stockin_guid, + stockin_id, + in_type, + create_date, + create_man_id, + status, + warehouse_id, + spare5, + spare4, + spare3, + finish_date, + spare2, + spare1, + erp_bill, + stock_source, + department_no, + customer_no, + class_no, + supplier_no, + + + #{stockinGuid}, + #{stockinId}, + #{inType}, + #{createDate}, + #{createManId}, + #{status}, + #{warehouseId}, + #{spare5}, + #{spare4}, + #{spare3}, + #{finishDate}, + #{spare2}, + #{spare1}, + #{erpBill}, + #{stockSource}, + #{departmentNo}, + #{customerNo}, + #{classNo}, + #{supplierNo}, + + + + insert into receive_stockin_finish + select * from receive_stockin where stockin_guid = #{stockinGuid} + + + + update receive_stockin + + stockin_id = #{stockinId}, + in_type = #{inType}, + create_date = #{createDate}, + create_man_id = #{createManId}, + status = #{status}, + warehouse_id = #{warehouseId}, + spare5 = #{spare5}, + spare4 = #{spare4}, + spare3 = #{spare3}, + finish_date = #{finishDate}, + spare2 = #{spare2}, + spare1 = #{spare1}, + erp_bill = #{erpBill}, + stock_source = #{stockSource}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + class_no = #{classNo}, + supplier_no = #{supplierNo}, + + where stockin_guid = #{stockinGuid} + + + + delete from receive_stockin where stockin_guid = #{stockinGuid} + + + + delete from receive_stockin where stockin_guid in + + #{stockinGuid} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/requestInterface/RequestLogMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/requestInterface/RequestLogMapper.xml new file mode 100644 index 0000000..56a21c2 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/requestInterface/RequestLogMapper.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + select request_id, request_time, source_system, target_system, endpoint, request_url, request_method, request_headers, request_body, response_time, response_body, response_status, error_details, duration, Is_successful from request_log + + + + + + + + insert into request_log + + request_time, + source_system, + target_system, + endpoint, + request_url, + request_method, + request_headers, + request_body, + response_time, + response_body, + response_status, + error_details, + duration, + Is_successful, + + + #{requestTime}, + #{sourceSystem}, + #{targetSystem}, + #{endpoint}, + #{requestUrl}, + #{requestMethod}, + #{requestHeaders}, + #{requestBody}, + #{responseTime}, + #{responseBody}, + #{responseStatus}, + #{errorDetails}, + #{duration}, + #{isSuccessful}, + + + + + update request_log + + request_time = #{requestTime}, + source_system = #{sourceSystem}, + target_system = #{targetSystem}, + endpoint = #{endpoint}, + request_url = #{requestUrl}, + request_method = #{requestMethod}, + request_headers = #{requestHeaders}, + request_body = #{requestBody}, + response_time = #{responseTime}, + response_body = #{responseBody}, + response_status = #{responseStatus}, + error_details = #{errorDetails}, + duration = #{duration}, + Is_successful = #{isSuccessful}, + + where request_id = #{requestId} + + + + delete from request_log where request_id = #{requestId} + + + + delete from request_log where request_id in + + #{requestId} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/StockSummaryMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/StockSummaryMapper.xml new file mode 100644 index 0000000..81e64fe --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/StockSummaryMapper.xml @@ -0,0 +1,415 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT + + + s.stock_id, + s.cargo_space_id, + s.stock_status, + s.product_status, + s.lot_no, + s.in_date, + s.back_date, + s.product_guid, + s.job_id, + s.tray_code, + s.out_quantity, + s.stockin_detail_id, + s.stockin_id, + s.in_type, + s.in_class_id, + s.warehouse_id, + s.stacking_id, + s.product_id, + s.product_name, + s.voltage, + s.power, + s.phase, + s.order_id, + bcs.cargo_space_name, + bcs.status as cargo_space_status, + bcs.locked, + s.spare1, + s.spare2, + s.spare3, + s.spare4, + s.spare5, + s.spare6, + s.spare7, + s.spare8, + s.net_weight, + s.gross_weight, + s.distribution, + s.model, + SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity + FROM bas_stock s + LEFT JOIN bas_cargo_space bcs ON bcs.cargo_space_id = s.cargo_space_id + + AND s.stock_id like concat('%', #{stockId}, '%') + AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%') + AND s.stock_status like concat('%', #{stockStatus}, '%') + AND s.product_status like concat('%', #{productStatus}, '%') + AND s.lot_no like concat('%', #{lotNo}, '%') + AND s.in_date like concat('%', #{inDate}, '%') + AND s.back_date like concat('%', #{backDate}, '%') + AND s.product_guid like concat('%', #{productGuid}, '%') + AND s.job_id like concat('%', #{jobId}, '%') + AND s.tray_code like concat('%', #{trayCode}, '%') + AND s.out_quantity like concat('%', #{outQuantity}, '%') + AND s.stockin_detail_id like concat('%', #{stockinDetailId}, '%') + AND s.stockin_id like concat('%', #{stockinId}, '%') + AND s.in_type like concat('%', #{inType}, '%') + AND s.in_class_id like concat('%', #{inClassId}, '%') + AND s.warehouse_id like concat('%', #{warehouseId}, '%') + AND s.stacking_id like concat('%', #{stackingId}, '%') + AND s.product_id like concat('%', #{productId}, '%') + AND s.product_name like concat('%', #{productName}, '%') + AND s.voltage like concat('%', #{voltage}, '%') + AND s.power like concat('%', #{power}, '%') + AND s.phase like concat('%', #{phase}, '%') + AND s.order_id like concat('%', #{orderId}, '%') + AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%') + AND bcs.status like concat('%', #{cargoSpaceStatus}, '%') + AND bcs.locked like concat('%', #{locked}, '%') + AND s.spare1 like concat('%', #{spare1}, '%') + AND s.spare2 like concat('%', #{spare2}, '%') + AND s.spare3 like concat('%', #{spare3}, '%') + AND s.spare4 like concat('%', #{spare4}, '%') + AND s.spare5 like concat('%', #{spare5}, '%') + AND s.spare6 like concat('%', #{spare6}, '%') + AND s.spare7 like concat('%', #{spare7}, '%') + AND s.spare8 like concat('%', #{spare8}, '%') + AND s.net_weight like concat('%', #{netWeight}, '%') + AND s.gross_weight like concat('%', #{grossWeight}, '%') + AND s.distribution like concat('%', #{distribution}, '%') + AND s.model like concat('%', #{model}, '%') + + GROUP BY + + ,s.stock_id + ,s.cargo_space_id + ,s.stock_status + ,s.product_status + ,s.lot_no + ,s.in_date + ,s.back_date + ,s.product_guid + ,s.job_id + ,s.tray_code + ,s.out_quantity + ,s.stockin_detail_id + ,s.stockin_id + ,s.in_type + ,s.in_class_id + ,s.warehouse_id + ,s.stacking_id + ,s.product_id + ,s.product_name + ,s.voltage + ,s.power + ,s.phase + ,s.order_id + ,bcs.cargo_space_name + ,bcs.status + ,bcs.locked + ,s.spare1 + ,s.spare2 + ,s.spare3 + ,s.spare4 + ,s.spare5 + ,s.spare6 + ,s.spare7 + ,s.spare8 + ,s.net_weight + ,s.gross_weight + ,s.distribution + ,s.model + + + + 1 as group_all, + SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity + FROM bas_stock s + LEFT JOIN bas_cargo_space bcs ON bcs.cargo_space_id = s.cargo_space_id + + AND s.stock_id like concat('%', #{stockId}, '%') + AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%') + AND s.stock_status like concat('%', #{stockStatus}, '%') + AND s.product_status like concat('%', #{productStatus}, '%') + AND s.lot_no like concat('%', #{lotNo}, '%') + AND s.in_date like concat('%', #{inDate}, '%') + AND s.back_date like concat('%', #{backDate}, '%') + AND s.product_guid like concat('%', #{productGuid}, '%') + AND s.job_id like concat('%', #{jobId}, '%') + AND s.tray_code like concat('%', #{trayCode}, '%') + AND s.out_quantity like concat('%', #{outQuantity}, '%') + AND s.stockin_detail_id like concat('%', #{stockinDetailId}, '%') + AND s.stockin_id like concat('%', #{stockinId}, '%') + AND s.in_type like concat('%', #{inType}, '%') + AND s.in_class_id like concat('%', #{inClassId}, '%') + AND s.warehouse_id like concat('%', #{warehouseId}, '%') + AND s.stacking_id like concat('%', #{stackingId}, '%') + AND s.product_id like concat('%', #{productId}, '%') + AND s.product_name like concat('%', #{productName}, '%') + AND s.voltage like concat('%', #{voltage}, '%') + AND s.power like concat('%', #{power}, '%') + AND s.phase like concat('%', #{phase}, '%') + AND s.order_id like concat('%', #{orderId}, '%') + AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%') + AND bcs.status like concat('%', #{cargoSpaceStatus}, '%') + AND bcs.locked like concat('%', #{locked}, '%') + AND s.spare1 like concat('%', #{spare1}, '%') + AND s.spare2 like concat('%', #{spare2}, '%') + AND s.spare3 like concat('%', #{spare3}, '%') + AND s.spare4 like concat('%', #{spare4}, '%') + AND s.spare5 like concat('%', #{spare5}, '%') + AND s.spare6 like concat('%', #{spare6}, '%') + AND s.spare7 like concat('%', #{spare7}, '%') + AND s.spare8 like concat('%', #{spare8}, '%') + AND s.net_weight like concat('%', #{netWeight}, '%') + AND s.gross_weight like concat('%', #{grossWeight}, '%') + AND s.distribution like concat('%', #{distribution}, '%') + AND s.model like concat('%', #{model}, '%') + + + + + + + + + + + insert into stock_summary + + only_identity, + product_id, + product_name, + spec, + unit, + price, + parent_id, + cargo_no, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + spare7, + spare8, + spare9, + spare10, + spare11, + spare12, + spare13, + spare14, + spare15, + spare16, + spare17, + spare18, + spare19, + spare20, + spare21, + spare22, + spare23, + spare24, + spare25, + spare26, + spare27, + spare28, + spare29, + spare30, + spare31, + spare32, + spare33, + spare34, + spare35, + spare36, + spare37, + spare38, + spare39, + remark, + lot_no, + warehouse_id, + cargo_space_id, + quantity, + + + #{onlyIdentity}, + #{productId}, + #{productName}, + #{spec}, + #{unit}, + #{price}, + #{parentId}, + #{cargoNo}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, + #{spare9}, + #{spare10}, + #{spare11}, + #{spare12}, + #{spare13}, + #{spare14}, + #{spare15}, + #{spare16}, + #{spare17}, + #{spare18}, + #{spare19}, + #{spare20}, + #{spare21}, + #{spare22}, + #{spare23}, + #{spare24}, + #{spare25}, + #{spare26}, + #{spare27}, + #{spare28}, + #{spare29}, + #{spare30}, + #{spare31}, + #{spare32}, + #{spare33}, + #{spare34}, + #{spare35}, + #{spare36}, + #{spare37}, + #{spare38}, + #{spare39}, + #{remark}, + #{lotNo}, + #{warehouseId}, + #{cargoSpaceId}, + #{quantity}, + + + + + update stock_summary + + product_id = #{productId}, + product_name = #{productName}, + spec = #{spec}, + unit = #{unit}, + price = #{price}, + parent_id = #{parentId}, + cargo_no = #{cargoNo}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, + spare9 = #{spare9}, + spare10 = #{spare10}, + spare11 = #{spare11}, + spare12 = #{spare12}, + spare13 = #{spare13}, + spare14 = #{spare14}, + spare15 = #{spare15}, + spare16 = #{spare16}, + spare17 = #{spare17}, + spare18 = #{spare18}, + spare19 = #{spare19}, + spare20 = #{spare20}, + spare21 = #{spare21}, + spare22 = #{spare22}, + spare23 = #{spare23}, + spare24 = #{spare24}, + spare25 = #{spare25}, + spare26 = #{spare26}, + spare27 = #{spare27}, + spare28 = #{spare28}, + spare29 = #{spare29}, + spare30 = #{spare30}, + spare31 = #{spare31}, + spare32 = #{spare32}, + spare33 = #{spare33}, + spare34 = #{spare34}, + spare35 = #{spare35}, + spare36 = #{spare36}, + spare37 = #{spare37}, + spare38 = #{spare38}, + spare39 = #{spare39}, + remark = #{remark}, + lot_no = #{lotNo}, + warehouse_id = #{warehouseId}, + cargo_space_id = #{cargoSpaceId}, + quantity = #{quantity}, + + where only_identity = #{onlyIdentity} + + + + delete from stock_summary where only_identity = #{onlyIdentity} + + + + delete from stock_summary where only_identity in + + #{onlyIdentity} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseInFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseInFlowMapper.xml new file mode 100644 index 0000000..79a1a0a --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseInFlowMapper.xml @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_in_flow vfwif + + + + + + + + insert into view_flat_warehouse_in_flow + + id, + in_or_out, + in_or_out_sotck_id, + in_or_out_sotck_detail_id, + product_guid, + product_id, + quantity, + create_time, + create_man, + warehouse_id, + warehouse_name, + address, + c_desc, + warehouse_kind, + warehouse_type, + is_current, + product_name, + spec, + unit, + price, + remark, + spare1, + spare2, + spare5, + spare6, + spare7, + spare8, + + + #{id}, + #{inOrOut}, + #{inOrOutSotckId}, + #{inOrOutSotckDetailId}, + #{productGuid}, + #{productId}, + #{quantity}, + #{createTime}, + #{createMan}, + #{warehouseId}, + #{warehouseName}, + #{address}, + #{cDesc}, + #{warehouseKind}, + #{warehouseType}, + #{isCurrent}, + #{productName}, + #{spec}, + #{unit}, + #{price}, + #{remark}, + #{spare1}, + #{spare2}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, + + + + + update view_flat_warehouse_in_flow + + in_or_out = #{inOrOut}, + in_or_out_sotck_id = #{inOrOutSotckId}, + in_or_out_sotck_detail_id = #{inOrOutSotckDetailId}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + create_time = #{createTime}, + create_man = #{createMan}, + warehouse_id = #{warehouseId}, + warehouse_name = #{warehouseName}, + address = #{address}, + c_desc = #{cDesc}, + warehouse_kind = #{warehouseKind}, + warehouse_type = #{warehouseType}, + is_current = #{isCurrent}, + product_name = #{productName}, + spec = #{spec}, + unit = #{unit}, + price = #{price}, + remark = #{remark}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, + + where id = #{id} + + + + delete from view_flat_warehouse_in_flow where id = #{id} + + + + delete from view_flat_warehouse_in_flow where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseOutFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseOutFlowMapper.xml new file mode 100644 index 0000000..5b617ec --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseOutFlowMapper.xml @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_out_flow vfwof + + + + + + + + insert into view_flat_warehouse_out_flow + + id, + in_or_out, + in_or_out_sotck_id, + in_or_out_sotck_detail_id, + product_guid, + product_id, + quantity, + create_time, + create_man, + warehouse_id, + warehouse_name, + address, + c_desc, + warehouse_kind, + warehouse_type, + is_current, + product_name, + spec, + unit, + price, + remark, + spare1, + spare2, + spare5, + spare6, + spare7, + spare8, + + + #{id}, + #{inOrOut}, + #{inOrOutSotckId}, + #{inOrOutSotckDetailId}, + #{productGuid}, + #{productId}, + #{quantity}, + #{createTime}, + #{createMan}, + #{warehouseId}, + #{warehouseName}, + #{address}, + #{cDesc}, + #{warehouseKind}, + #{warehouseType}, + #{isCurrent}, + #{productName}, + #{spec}, + #{unit}, + #{price}, + #{remark}, + #{spare1}, + #{spare2}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, + + + + + update view_flat_warehouse_out_flow + + in_or_out = #{inOrOut}, + in_or_out_sotck_id = #{inOrOutSotckId}, + in_or_out_sotck_detail_id = #{inOrOutSotckDetailId}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + create_time = #{createTime}, + create_man = #{createMan}, + warehouse_id = #{warehouseId}, + warehouse_name = #{warehouseName}, + address = #{address}, + c_desc = #{cDesc}, + warehouse_kind = #{warehouseKind}, + warehouse_type = #{warehouseType}, + is_current = #{isCurrent}, + product_name = #{productName}, + spec = #{spec}, + unit = #{unit}, + price = #{price}, + remark = #{remark}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, + + where id = #{id} + + + + delete from view_flat_warehouse_out_flow where id = #{id} + + + + delete from view_flat_warehouse_out_flow where id in + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewInJobFlowMapper.xml new file mode 100644 index 0000000..827b64a --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewInJobFlowMapper.xml @@ -0,0 +1,293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select job_id, status, on_line_type, task_no, supplier_id, customer_id, department_id, tray_code, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, line_id, workshop_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, class_id, warehouse_id, fault_flag, job_detail_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, stock_status, in_quantity, stock_quantity, out_quantity, stockin_id, stacking_id, spare1, spare2, spare3, stockin_detail_id, spare5, spare6, spec, unit, product_id, product_name, cargo_space_name from view_in_job_flow + + + + + + + + insert into view_in_job_flow + + job_id, + status, + on_line_type, + task_no, + supplier_id, + customer_id, + department_id, + tray_code, + roadway_id, + cargo_space_id, + target_roadway_id, + target_cargo_space_id, + line_id, + workshop_id, + priority, + execution_phase, + in_or_out, + create_time, + start_time, + finish_time, + entrance_id, + exit_id, + class_id, + warehouse_id, + fault_flag, + job_detail_id, + stock_id, + lot_no, + in_date, + in_or_out_id, + in_or_out_d_id, + product_guid, + stock_status, + in_quantity, + stock_quantity, + out_quantity, + stockin_id, + stacking_id, + spare1, + spare2, + spare3, + stockin_detail_id, + spare5, + spare6, + spec, + unit, + product_id, + product_name, + cargo_space_name, + + + #{jobId}, + #{status}, + #{onLineType}, + #{taskNo}, + #{supplierId}, + #{customerId}, + #{departmentId}, + #{trayCode}, + #{roadwayId}, + #{cargoSpaceId}, + #{targetRoadwayId}, + #{targetCargoSpaceId}, + #{lineId}, + #{workshopId}, + #{priority}, + #{executionPhase}, + #{inOrOut}, + #{createTime}, + #{startTime}, + #{finishTime}, + #{entranceId}, + #{exitId}, + #{classId}, + #{warehouseId}, + #{faultFlag}, + #{jobDetailId}, + #{stockId}, + #{lotNo}, + #{inDate}, + #{inOrOutId}, + #{inOrOutDId}, + #{productGuid}, + #{stockStatus}, + #{inQuantity}, + #{stockQuantity}, + #{outQuantity}, + #{stockinId}, + #{stackingId}, + #{spare1}, + #{spare2}, + #{spare3}, + #{stockinDetailId}, + #{spare5}, + #{spare6}, + #{spec}, + #{unit}, + #{productId}, + #{productName}, + #{cargoSpaceName}, + + + + + update view_in_job_flow + + status = #{status}, + on_line_type = #{onLineType}, + task_no = #{taskNo}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + department_id = #{departmentId}, + tray_code = #{trayCode}, + roadway_id = #{roadwayId}, + cargo_space_id = #{cargoSpaceId}, + target_roadway_id = #{targetRoadwayId}, + target_cargo_space_id = #{targetCargoSpaceId}, + line_id = #{lineId}, + workshop_id = #{workshopId}, + priority = #{priority}, + execution_phase = #{executionPhase}, + in_or_out = #{inOrOut}, + create_time = #{createTime}, + start_time = #{startTime}, + finish_time = #{finishTime}, + entrance_id = #{entranceId}, + exit_id = #{exitId}, + class_id = #{classId}, + warehouse_id = #{warehouseId}, + fault_flag = #{faultFlag}, + job_detail_id = #{jobDetailId}, + stock_id = #{stockId}, + lot_no = #{lotNo}, + in_date = #{inDate}, + in_or_out_id = #{inOrOutId}, + in_or_out_d_id = #{inOrOutDId}, + product_guid = #{productGuid}, + stock_status = #{stockStatus}, + in_quantity = #{inQuantity}, + stock_quantity = #{stockQuantity}, + out_quantity = #{outQuantity}, + stockin_id = #{stockinId}, + stacking_id = #{stackingId}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + stockin_detail_id = #{stockinDetailId}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spec = #{spec}, + unit = #{unit}, + product_id = #{productId}, + product_name = #{productName}, + cargo_space_name = #{cargoSpaceName}, + + where job_id = #{jobId} + + + + delete from view_in_job_flow where job_id = #{jobId} + + + + delete from view_in_job_flow where job_id in + + #{jobId} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewOutJobFlowMapper.xml new file mode 100644 index 0000000..0b54225 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewOutJobFlowMapper.xml @@ -0,0 +1,293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select job_id, status, on_line_type, task_no, supplier_id, customer_id, department_id, tray_code, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, line_id, workshop_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, class_id, warehouse_id, fault_flag, job_detail_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, stock_status, in_quantity, stock_quantity, out_quantity, stockin_id, stacking_id, spare1, spare2, spare3, stockin_detail_id, spare5, spare6, spec, unit, product_id, product_name, cargo_space_name from view_out_job_flow + + + + + + + + insert into view_out_job_flow + + job_id, + status, + on_line_type, + task_no, + supplier_id, + customer_id, + department_id, + tray_code, + roadway_id, + cargo_space_id, + target_roadway_id, + target_cargo_space_id, + line_id, + workshop_id, + priority, + execution_phase, + in_or_out, + create_time, + start_time, + finish_time, + entrance_id, + exit_id, + class_id, + warehouse_id, + fault_flag, + job_detail_id, + stock_id, + lot_no, + in_date, + in_or_out_id, + in_or_out_d_id, + product_guid, + stock_status, + in_quantity, + stock_quantity, + out_quantity, + stockin_id, + stacking_id, + spare1, + spare2, + spare3, + stockin_detail_id, + spare5, + spare6, + spec, + unit, + product_id, + product_name, + cargo_space_name, + + + #{jobId}, + #{status}, + #{onLineType}, + #{taskNo}, + #{supplierId}, + #{customerId}, + #{departmentId}, + #{trayCode}, + #{roadwayId}, + #{cargoSpaceId}, + #{targetRoadwayId}, + #{targetCargoSpaceId}, + #{lineId}, + #{workshopId}, + #{priority}, + #{executionPhase}, + #{inOrOut}, + #{createTime}, + #{startTime}, + #{finishTime}, + #{entranceId}, + #{exitId}, + #{classId}, + #{warehouseId}, + #{faultFlag}, + #{jobDetailId}, + #{stockId}, + #{lotNo}, + #{inDate}, + #{inOrOutId}, + #{inOrOutDId}, + #{productGuid}, + #{stockStatus}, + #{inQuantity}, + #{stockQuantity}, + #{outQuantity}, + #{stockinId}, + #{stackingId}, + #{spare1}, + #{spare2}, + #{spare3}, + #{stockinDetailId}, + #{spare5}, + #{spare6}, + #{spec}, + #{unit}, + #{productId}, + #{productName}, + #{cargoSpaceName}, + + + + + update view_out_job_flow + + status = #{status}, + on_line_type = #{onLineType}, + task_no = #{taskNo}, + supplier_id = #{supplierId}, + customer_id = #{customerId}, + department_id = #{departmentId}, + tray_code = #{trayCode}, + roadway_id = #{roadwayId}, + cargo_space_id = #{cargoSpaceId}, + target_roadway_id = #{targetRoadwayId}, + target_cargo_space_id = #{targetCargoSpaceId}, + line_id = #{lineId}, + workshop_id = #{workshopId}, + priority = #{priority}, + execution_phase = #{executionPhase}, + in_or_out = #{inOrOut}, + create_time = #{createTime}, + start_time = #{startTime}, + finish_time = #{finishTime}, + entrance_id = #{entranceId}, + exit_id = #{exitId}, + class_id = #{classId}, + warehouse_id = #{warehouseId}, + fault_flag = #{faultFlag}, + job_detail_id = #{jobDetailId}, + stock_id = #{stockId}, + lot_no = #{lotNo}, + in_date = #{inDate}, + in_or_out_id = #{inOrOutId}, + in_or_out_d_id = #{inOrOutDId}, + product_guid = #{productGuid}, + stock_status = #{stockStatus}, + in_quantity = #{inQuantity}, + stock_quantity = #{stockQuantity}, + out_quantity = #{outQuantity}, + stockin_id = #{stockinId}, + stacking_id = #{stackingId}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + stockin_detail_id = #{stockinDetailId}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spec = #{spec}, + unit = #{unit}, + product_id = #{productId}, + product_name = #{productName}, + cargo_space_name = #{cargoSpaceName}, + + where job_id = #{jobId} + + + + delete from view_out_job_flow where job_id = #{jobId} + + + + delete from view_out_job_flow where job_id in + + #{jobId} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockDetailMapper.xml new file mode 100644 index 0000000..1d1885e --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockDetailMapper.xml @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select only_identity, stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name, cargo_space_status, locked from view_stock_detail + + + + + + + + insert into view_stock_detail + + only_identity, + stock_id, + cargo_space_id, + stock_status, + product_status, + lot_no, + in_date, + back_date, + product_guid, + quantity, + job_id, + tray_code, + out_quantity, + stockin_detail_id, + stockin_id, + in_type, + in_class_id, + warehouse_id, + stacking_id, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + product_id, + product_name, + voltage, + power, + phase, + net_weight, + gross_weight, + distribution, + model, + order_id, + spare7, + spare8, + cargo_space_name, + cargo_space_status, + locked, + + + #{onlyIdentity}, + #{stockId}, + #{cargoSpaceId}, + #{stockStatus}, + #{productStatus}, + #{lotNo}, + #{inDate}, + #{backDate}, + #{productGuid}, + #{quantity}, + #{jobId}, + #{trayCode}, + #{outQuantity}, + #{stockinDetailId}, + #{stockinId}, + #{inType}, + #{inClassId}, + #{warehouseId}, + #{stackingId}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{productId}, + #{productName}, + #{voltage}, + #{power}, + #{phase}, + #{netWeight}, + #{grossWeight}, + #{distribution}, + #{model}, + #{orderId}, + #{spare7}, + #{spare8}, + #{cargoSpaceName}, + #{cargoSpaceStatus}, + #{locked}, + + + + + update view_stock_detail + + stock_id = #{stockId}, + cargo_space_id = #{cargoSpaceId}, + stock_status = #{stockStatus}, + product_status = #{productStatus}, + lot_no = #{lotNo}, + in_date = #{inDate}, + back_date = #{backDate}, + product_guid = #{productGuid}, + quantity = #{quantity}, + job_id = #{jobId}, + tray_code = #{trayCode}, + out_quantity = #{outQuantity}, + stockin_detail_id = #{stockinDetailId}, + stockin_id = #{stockinId}, + in_type = #{inType}, + in_class_id = #{inClassId}, + warehouse_id = #{warehouseId}, + stacking_id = #{stackingId}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + product_id = #{productId}, + product_name = #{productName}, + voltage = #{voltage}, + power = #{power}, + phase = #{phase}, + net_weight = #{netWeight}, + gross_weight = #{grossWeight}, + distribution = #{distribution}, + model = #{model}, + order_id = #{orderId}, + spare7 = #{spare7}, + spare8 = #{spare8}, + cargo_space_name = #{cargoSpaceName}, + cargo_space_status = #{cargoSpaceStatus}, + locked = #{locked}, + + where only_identity = #{onlyIdentity} + + + + delete from view_stock_detail where only_identity = #{onlyIdentity} + + + + delete from view_stock_detail where only_identity in + + #{onlyIdentity} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockSecureMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockSecureMapper.xml new file mode 100644 index 0000000..888dfc5 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockSecureMapper.xml @@ -0,0 +1,484 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_secure + + + + + + + + insert into view_stock_secure + + stock_id, + cargo_space_id, + stock_status, + product_status, + lot_no, + in_date, + back_date, + quantity, + job_id, + tray_code, + out_quantity, + stockin_detail_id, + stockin_id, + in_type, + in_class_id, + warehouse_id, + stacking_id, + warehouse_name, + address, + c_desc, + warehouse_kind, + warehouse_type, + is_current, + product_guid, + product_id, + parent_id, + price, + cargo_no, + unit, + spec, + remark, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + product_name, + spare7, + spare8, + spare9, + spare10, + spare11, + spare12, + spare13, + spare14, + spare15, + spare16, + spare17, + spare18, + spare19, + spare20, + spare21, + spare22, + spare23, + spare24, + spare25, + spare26, + spare27, + spare28, + spare29, + spare30, + spare31, + spare32, + spare33, + spare34, + spare35, + spare36, + spare37, + spare38, + spare39, + cargo_space_name, + roadway_id, + cargo_area_id, + the_type, + the_type_name, + the_platoon, + the_column, + the_floor, + cargo_status, + locked, + cargo_hight, + iss_double, + group_coding_no, + group_coding, + cargo_space_logo, + this_cargo_area, + + + #{stockId}, + #{cargoSpaceId}, + #{stockStatus}, + #{productStatus}, + #{lotNo}, + #{inDate}, + #{backDate}, + #{quantity}, + #{jobId}, + #{trayCode}, + #{outQuantity}, + #{stockinDetailId}, + #{stockinId}, + #{inType}, + #{inClassId}, + #{warehouseId}, + #{stackingId}, + #{warehouseName}, + #{address}, + #{cDesc}, + #{warehouseKind}, + #{warehouseType}, + #{isCurrent}, + #{productGuid}, + #{productId}, + #{parentId}, + #{price}, + #{cargoNo}, + #{unit}, + #{spec}, + #{remark}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{productName}, + #{spare7}, + #{spare8}, + #{spare9}, + #{spare10}, + #{spare11}, + #{spare12}, + #{spare13}, + #{spare14}, + #{spare15}, + #{spare16}, + #{spare17}, + #{spare18}, + #{spare19}, + #{spare20}, + #{spare21}, + #{spare22}, + #{spare23}, + #{spare24}, + #{spare25}, + #{spare26}, + #{spare27}, + #{spare28}, + #{spare29}, + #{spare30}, + #{spare31}, + #{spare32}, + #{spare33}, + #{spare34}, + #{spare35}, + #{spare36}, + #{spare37}, + #{spare38}, + #{spare39}, + #{cargoSpaceName}, + #{roadwayId}, + #{cargoAreaId}, + #{theType}, + #{theTypeName}, + #{thePlatoon}, + #{theColumn}, + #{theFloor}, + #{cargoStatus}, + #{locked}, + #{cargoHight}, + #{issDouble}, + #{groupCodingNo}, + #{groupCoding}, + #{cargoSpaceLogo}, + #{thisCargoArea}, + + + + + update view_stock_secure + + cargo_space_id = #{cargoSpaceId}, + stock_status = #{stockStatus}, + product_status = #{productStatus}, + lot_no = #{lotNo}, + in_date = #{inDate}, + back_date = #{backDate}, + quantity = #{quantity}, + job_id = #{jobId}, + tray_code = #{trayCode}, + out_quantity = #{outQuantity}, + stockin_detail_id = #{stockinDetailId}, + stockin_id = #{stockinId}, + in_type = #{inType}, + in_class_id = #{inClassId}, + warehouse_id = #{warehouseId}, + stacking_id = #{stackingId}, + warehouse_name = #{warehouseName}, + address = #{address}, + c_desc = #{cDesc}, + warehouse_kind = #{warehouseKind}, + warehouse_type = #{warehouseType}, + is_current = #{isCurrent}, + product_guid = #{productGuid}, + product_id = #{productId}, + parent_id = #{parentId}, + price = #{price}, + cargo_no = #{cargoNo}, + unit = #{unit}, + spec = #{spec}, + remark = #{remark}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + product_name = #{productName}, + spare7 = #{spare7}, + spare8 = #{spare8}, + spare9 = #{spare9}, + spare10 = #{spare10}, + spare11 = #{spare11}, + spare12 = #{spare12}, + spare13 = #{spare13}, + spare14 = #{spare14}, + spare15 = #{spare15}, + spare16 = #{spare16}, + spare17 = #{spare17}, + spare18 = #{spare18}, + spare19 = #{spare19}, + spare20 = #{spare20}, + spare21 = #{spare21}, + spare22 = #{spare22}, + spare23 = #{spare23}, + spare24 = #{spare24}, + spare25 = #{spare25}, + spare26 = #{spare26}, + spare27 = #{spare27}, + spare28 = #{spare28}, + spare29 = #{spare29}, + spare30 = #{spare30}, + spare31 = #{spare31}, + spare32 = #{spare32}, + spare33 = #{spare33}, + spare34 = #{spare34}, + spare35 = #{spare35}, + spare36 = #{spare36}, + spare37 = #{spare37}, + spare38 = #{spare38}, + spare39 = #{spare39}, + cargo_space_name = #{cargoSpaceName}, + roadway_id = #{roadwayId}, + cargo_area_id = #{cargoAreaId}, + the_type = #{theType}, + the_type_name = #{theTypeName}, + the_platoon = #{thePlatoon}, + the_column = #{theColumn}, + the_floor = #{theFloor}, + cargo_status = #{cargoStatus}, + locked = #{locked}, + cargo_hight = #{cargoHight}, + iss_double = #{issDouble}, + group_coding_no = #{groupCodingNo}, + group_coding = #{groupCoding}, + cargo_space_logo = #{cargoSpaceLogo}, + this_cargo_area = #{thisCargoArea}, + + where stock_id = #{stockId} + + + + delete from view_stock_secure where stock_id = #{stockId} + + + + delete from view_stock_secure where stock_id in + + #{stockId} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockWarningMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockWarningMapper.xml new file mode 100644 index 0000000..b6edfe6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockWarningMapper.xml @@ -0,0 +1,484 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_warning + + + + + + + + insert into view_stock_warning + + stock_id, + cargo_space_id, + stock_status, + product_status, + lot_no, + in_date, + back_date, + quantity, + job_id, + tray_code, + out_quantity, + stockin_detail_id, + stockin_id, + in_type, + in_class_id, + warehouse_id, + stacking_id, + warehouse_name, + address, + c_desc, + warehouse_kind, + warehouse_type, + is_current, + product_guid, + product_id, + parent_id, + price, + cargo_no, + unit, + spec, + remark, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + product_name, + spare7, + spare8, + spare9, + spare10, + spare11, + spare12, + spare13, + spare14, + spare15, + spare16, + spare17, + spare18, + spare19, + spare20, + spare21, + spare22, + spare23, + spare24, + spare25, + spare26, + spare27, + spare28, + spare29, + spare30, + spare31, + spare32, + spare33, + spare34, + spare35, + spare36, + spare37, + spare38, + spare39, + cargo_space_name, + roadway_id, + cargo_area_id, + the_type, + the_type_name, + the_platoon, + the_column, + the_floor, + cargo_status, + locked, + cargo_hight, + iss_double, + group_coding_no, + group_coding, + cargo_space_logo, + this_cargo_area, + + + #{stockId}, + #{cargoSpaceId}, + #{stockStatus}, + #{productStatus}, + #{lotNo}, + #{inDate}, + #{backDate}, + #{quantity}, + #{jobId}, + #{trayCode}, + #{outQuantity}, + #{stockinDetailId}, + #{stockinId}, + #{inType}, + #{inClassId}, + #{warehouseId}, + #{stackingId}, + #{warehouseName}, + #{address}, + #{cDesc}, + #{warehouseKind}, + #{warehouseType}, + #{isCurrent}, + #{productGuid}, + #{productId}, + #{parentId}, + #{price}, + #{cargoNo}, + #{unit}, + #{spec}, + #{remark}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{productName}, + #{spare7}, + #{spare8}, + #{spare9}, + #{spare10}, + #{spare11}, + #{spare12}, + #{spare13}, + #{spare14}, + #{spare15}, + #{spare16}, + #{spare17}, + #{spare18}, + #{spare19}, + #{spare20}, + #{spare21}, + #{spare22}, + #{spare23}, + #{spare24}, + #{spare25}, + #{spare26}, + #{spare27}, + #{spare28}, + #{spare29}, + #{spare30}, + #{spare31}, + #{spare32}, + #{spare33}, + #{spare34}, + #{spare35}, + #{spare36}, + #{spare37}, + #{spare38}, + #{spare39}, + #{cargoSpaceName}, + #{roadwayId}, + #{cargoAreaId}, + #{theType}, + #{theTypeName}, + #{thePlatoon}, + #{theColumn}, + #{theFloor}, + #{cargoStatus}, + #{locked}, + #{cargoHight}, + #{issDouble}, + #{groupCodingNo}, + #{groupCoding}, + #{cargoSpaceLogo}, + #{thisCargoArea}, + + + + + update view_stock_warning + + cargo_space_id = #{cargoSpaceId}, + stock_status = #{stockStatus}, + product_status = #{productStatus}, + lot_no = #{lotNo}, + in_date = #{inDate}, + back_date = #{backDate}, + quantity = #{quantity}, + job_id = #{jobId}, + tray_code = #{trayCode}, + out_quantity = #{outQuantity}, + stockin_detail_id = #{stockinDetailId}, + stockin_id = #{stockinId}, + in_type = #{inType}, + in_class_id = #{inClassId}, + warehouse_id = #{warehouseId}, + stacking_id = #{stackingId}, + warehouse_name = #{warehouseName}, + address = #{address}, + c_desc = #{cDesc}, + warehouse_kind = #{warehouseKind}, + warehouse_type = #{warehouseType}, + is_current = #{isCurrent}, + product_guid = #{productGuid}, + product_id = #{productId}, + parent_id = #{parentId}, + price = #{price}, + cargo_no = #{cargoNo}, + unit = #{unit}, + spec = #{spec}, + remark = #{remark}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + product_name = #{productName}, + spare7 = #{spare7}, + spare8 = #{spare8}, + spare9 = #{spare9}, + spare10 = #{spare10}, + spare11 = #{spare11}, + spare12 = #{spare12}, + spare13 = #{spare13}, + spare14 = #{spare14}, + spare15 = #{spare15}, + spare16 = #{spare16}, + spare17 = #{spare17}, + spare18 = #{spare18}, + spare19 = #{spare19}, + spare20 = #{spare20}, + spare21 = #{spare21}, + spare22 = #{spare22}, + spare23 = #{spare23}, + spare24 = #{spare24}, + spare25 = #{spare25}, + spare26 = #{spare26}, + spare27 = #{spare27}, + spare28 = #{spare28}, + spare29 = #{spare29}, + spare30 = #{spare30}, + spare31 = #{spare31}, + spare32 = #{spare32}, + spare33 = #{spare33}, + spare34 = #{spare34}, + spare35 = #{spare35}, + spare36 = #{spare36}, + spare37 = #{spare37}, + spare38 = #{spare38}, + spare39 = #{spare39}, + cargo_space_name = #{cargoSpaceName}, + roadway_id = #{roadwayId}, + cargo_area_id = #{cargoAreaId}, + the_type = #{theType}, + the_type_name = #{theTypeName}, + the_platoon = #{thePlatoon}, + the_column = #{theColumn}, + the_floor = #{theFloor}, + cargo_status = #{cargoStatus}, + locked = #{locked}, + cargo_hight = #{cargoHight}, + iss_double = #{issDouble}, + group_coding_no = #{groupCodingNo}, + group_coding = #{groupCoding}, + cargo_space_logo = #{cargoSpaceLogo}, + this_cargo_area = #{thisCargoArea}, + + where stock_id = #{stockId} + + + + delete from view_stock_warning where stock_id = #{stockId} + + + + delete from view_stock_warning where stock_id in + + #{stockId} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockinHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockinHistoryMapper.xml new file mode 100644 index 0000000..dfcd35f --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockinHistoryMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, lot_no, stockin_detail_id, product_guid, product_id, quantity, quantity_j, quantity_x, remark, assign_num, assign_num_j, assign_num_x, unit, spec, cjgx, scwl, dcwl, scan_num, scan_num_j, scan_num_x, product_name from view_stockin_history + + + + + + + + insert into view_stockin_history + + stockin_guid, + stockin_id, + in_type, + create_date, + create_man_id, + status, + warehouse_id, + spare5, + spare4, + spare3, + finish_date, + spare2, + spare1, + erp_bill, + stock_source, + department_no, + customer_no, + class_no, + supplier_no, + lot_no, + stockin_detail_id, + product_guid, + product_id, + quantity, + quantity_j, + quantity_x, + remark, + assign_num, + assign_num_j, + assign_num_x, + unit, + spec, + cjgx, + scwl, + dcwl, + scan_num, + scan_num_j, + scan_num_x, + product_name, + + + #{stockinGuid}, + #{stockinId}, + #{inType}, + #{createDate}, + #{createManId}, + #{status}, + #{warehouseId}, + #{spare5}, + #{spare4}, + #{spare3}, + #{finishDate}, + #{spare2}, + #{spare1}, + #{erpBill}, + #{stockSource}, + #{departmentNo}, + #{customerNo}, + #{classNo}, + #{supplierNo}, + #{lotNo}, + #{stockinDetailId}, + #{productGuid}, + #{productId}, + #{quantity}, + #{quantityJ}, + #{quantityX}, + #{remark}, + #{assignNum}, + #{assignNumJ}, + #{assignNumX}, + #{unit}, + #{spec}, + #{cjgx}, + #{scwl}, + #{dcwl}, + #{scanNum}, + #{scanNumJ}, + #{scanNumX}, + #{productName}, + + + + + update view_stockin_history + + stockin_id = #{stockinId}, + in_type = #{inType}, + create_date = #{createDate}, + create_man_id = #{createManId}, + status = #{status}, + warehouse_id = #{warehouseId}, + spare5 = #{spare5}, + spare4 = #{spare4}, + spare3 = #{spare3}, + finish_date = #{finishDate}, + spare2 = #{spare2}, + spare1 = #{spare1}, + erp_bill = #{erpBill}, + stock_source = #{stockSource}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + class_no = #{classNo}, + supplier_no = #{supplierNo}, + lot_no = #{lotNo}, + stockin_detail_id = #{stockinDetailId}, + product_guid = #{productGuid}, + product_id = #{productId}, + quantity = #{quantity}, + quantity_j = #{quantityJ}, + quantity_x = #{quantityX}, + remark = #{remark}, + assign_num = #{assignNum}, + assign_num_j = #{assignNumJ}, + assign_num_x = #{assignNumX}, + unit = #{unit}, + spec = #{spec}, + cjgx = #{cjgx}, + scwl = #{scwl}, + dcwl = #{dcwl}, + scan_num = #{scanNum}, + scan_num_j = #{scanNumJ}, + scan_num_x = #{scanNumX}, + product_name = #{productName}, + + where stockin_guid = #{stockinGuid} + + + + delete from view_stockin_history where stockin_guid = #{stockinGuid} + + + + delete from view_stockin_history where stockin_guid in + + #{stockinGuid} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockoutHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockoutHistoryMapper.xml new file mode 100644 index 0000000..88e434d --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockoutHistoryMapper.xml @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, spare1, spare2, spare3, spare4, spare5, stockout_detail_id, lot_no, product_id, quantity, assign_num, allot_quantity, remark, unit, spec, product_name, cjgx, scwl, dcwl, spare9 from view_stockout_history + + + + + + + + insert into view_stockout_history + + stockout_guid, + stockout_id, + out_type, + create_date, + department_no, + customer_no, + create_man_id, + status, + stockout_source, + warehouse_id, + class_now_id, + exit_id, + spare1, + spare2, + spare3, + spare4, + spare5, + stockout_detail_id, + lot_no, + product_id, + quantity, + assign_num, + allot_quantity, + remark, + unit, + spec, + product_name, + cjgx, + scwl, + dcwl, + spare9, + + + #{stockoutGuid}, + #{stockoutId}, + #{outType}, + #{createDate}, + #{departmentNo}, + #{customerNo}, + #{createManId}, + #{status}, + #{stockoutSource}, + #{warehouseId}, + #{classNowId}, + #{exitId}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{stockoutDetailId}, + #{lotNo}, + #{productId}, + #{quantity}, + #{assignNum}, + #{allotQuantity}, + #{remark}, + #{unit}, + #{spec}, + #{productName}, + #{cjgx}, + #{scwl}, + #{dcwl}, + #{spare9}, + + + + + update view_stockout_history + + stockout_id = #{stockoutId}, + out_type = #{outType}, + create_date = #{createDate}, + department_no = #{departmentNo}, + customer_no = #{customerNo}, + create_man_id = #{createManId}, + status = #{status}, + stockout_source = #{stockoutSource}, + warehouse_id = #{warehouseId}, + class_now_id = #{classNowId}, + exit_id = #{exitId}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + stockout_detail_id = #{stockoutDetailId}, + lot_no = #{lotNo}, + product_id = #{productId}, + quantity = #{quantity}, + assign_num = #{assignNum}, + allot_quantity = #{allotQuantity}, + remark = #{remark}, + unit = #{unit}, + spec = #{spec}, + product_name = #{productName}, + cjgx = #{cjgx}, + scwl = #{scwl}, + dcwl = #{dcwl}, + spare9 = #{spare9}, + + where stockout_guid = #{stockoutGuid} + + + + delete from view_stockout_history where stockout_guid = #{stockoutGuid} + + + + delete from view_stockout_history where stockout_guid in + + #{stockoutGuid} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockFreezeRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockFreezeRecordMapper.xml new file mode 100644 index 0000000..58d3edd --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockFreezeRecordMapper.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select wh_guid, stock_id, bsfr.cargo_space_id,bw.warehouse_name, bcs.cargo_space_name, bsfr.tray_code, product_id, product_name, print_date, lot_no, old_status, curr_status, method, bsfr.warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid + from bas_stock_freeze_record bsfr + left join bas_cargo_space bcs on bsfr.cargo_space_id=bcs.cargo_space_id + left join bas_warehouse bw on bsfr.warehouse_id=bw.warehouse_id + + + + + + + + insert into bas_stock_freeze_record + + wh_guid, + stock_id, + cargo_space_id, + tray_code, + product_id, + product_name, + print_date, + lot_no, + old_status, + curr_status, + method, + warehouse_id, + create_time, + stock_detail_id, + operating_target, + bar_code_old_quantity, + bar_code_quantity, + product_guid, + + + #{whGuid}, + #{stockId}, + #{cargoSpaceId}, + #{trayCode}, + #{productId}, + #{productName}, + #{printDate}, + #{lotNo}, + #{oldStatus}, + #{currStatus}, + #{method}, + #{warehouseId}, + #{createTime}, + #{stockDetailId}, + #{operatingTarget}, + #{barCodeOldQuantity}, + #{barCodeQuantity}, + #{productGuid}, + + + + + update bas_stock_freeze_record + + stock_id = #{stockId}, + cargo_space_id = #{cargoSpaceId}, + tray_code = #{trayCode}, + product_id = #{productId}, + product_name = #{productName}, + print_date = #{printDate}, + lot_no = #{lotNo}, + old_status = #{oldStatus}, + curr_status = #{currStatus}, + method = #{method}, + warehouse_id = #{warehouseId}, + create_time = #{createTime}, + stock_detail_id = #{stockDetailId}, + operating_target = #{operatingTarget}, + bar_code_old_quantity = #{barCodeOldQuantity}, + bar_code_quantity = #{barCodeQuantity}, + product_guid = #{productGuid}, + + where wh_guid = #{whGuid} + + + + delete from bas_stock_freeze_record where wh_guid = #{whGuid} + + + + delete from bas_stock_freeze_record where wh_guid in + + #{whGuid} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMaintainRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMaintainRecordMapper.xml new file mode 100644 index 0000000..45e5f74 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMaintainRecordMapper.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select wh_guid, stock_id, bsmr.cargo_space_id,bw.warehouse_name, bcs.cargo_space_name, bsmr.tray_code, product_id, product_name, print_date, lot_no, old_quantity, quantity, method, bsmr.warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid + from bas_stock_maintain_record bsmr + left join bas_cargo_space bcs on bsmr.cargo_space_id=bcs.cargo_space_id + left join bas_warehouse bw on bsmr.warehouse_id=bw.warehouse_id + + + + + + + + insert into bas_stock_maintain_record + + wh_guid, + stock_id, + cargo_space_id, + tray_code, + product_id, + product_name, + print_date, + lot_no, + old_quantity, + quantity, + method, + warehouse_id, + create_time, + stock_detail_id, + operating_target, + bar_code_old_quantity, + bar_code_quantity, + product_guid, + + + #{whGuid}, + #{stockId}, + #{cargoSpaceId}, + #{trayCode}, + #{productId}, + #{productName}, + #{printDate}, + #{lotNo}, + #{oldQuantity}, + #{quantity}, + #{method}, + #{warehouseId}, + #{createTime}, + #{stockDetailId}, + #{operatingTarget}, + #{barCodeOldQuantity}, + #{barCodeQuantity}, + #{productGuid}, + + + + + update bas_stock_maintain_record + + stock_id = #{stockId}, + cargo_space_id = #{cargoSpaceId}, + tray_code = #{trayCode}, + product_id = #{productId}, + product_name = #{productName}, + print_date = #{printDate}, + lot_no = #{lotNo}, + old_quantity = #{oldQuantity}, + quantity = #{quantity}, + method = #{method}, + warehouse_id = #{warehouseId}, + create_time = #{createTime}, + stock_detail_id = #{stockDetailId}, + operating_target = #{operatingTarget}, + bar_code_old_quantity = #{barCodeOldQuantity}, + bar_code_quantity = #{barCodeQuantity}, + product_guid = #{productGuid}, + + where wh_guid = #{whGuid} + + + + delete from bas_stock_maintain_record where wh_guid = #{whGuid} + + + + delete from bas_stock_maintain_record where wh_guid in + + #{whGuid} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMapper.xml new file mode 100644 index 0000000..638437d --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMapper.xml @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select bs.stock_id, bs.cargo_space_id, bs.stock_status, bs.product_status, bs.lot_no, bs.in_date, + bs.back_date, bs.product_guid, bs.quantity, bs.job_id, bs.tray_code, bs.out_quantity, + bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.in_class_id, bs.warehouse_id, bs.stacking_id, + bs.spare1, bs.spare2, bs.spare3, bs.spare4, bs.spare5, bs.spare6 , + bs.voltage,bs.power,bs.phase,bs.net_weight,bs.gross_weight,bs.distribution,bs.model,bs.order_id, + bs.product_name,bp.spare1 as englishDesc, + bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,bw.warehouse_name,bs.product_id, + bcs.locked,bcs.cargo_space_name,bcs.status as cargoSpaceStockStatus + from bas_stock bs + left join bas_product bp on bs.product_id = bp.product_id + left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id + left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id + + + + + + + + insert into bas_stock + + stock_id, + cargo_space_id, + stock_status, + product_status, + lot_no, + in_date, + back_date, + product_guid, + quantity, + job_id, + tray_code, + out_quantity, + stockin_detail_id, + stockin_id, + in_type, + in_class_id, + warehouse_id, + stacking_id, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + product_id, + + + #{stockId}, + #{cargoSpaceId}, + #{stockStatus}, + #{productStatus}, + #{lotNo}, + #{inDate}, + #{backDate}, + #{productGuid}, + #{quantity}, + #{jobId}, + #{trayCode}, + #{outQuantity}, + #{stockinDetailId}, + #{stockinId}, + #{inType}, + #{inClassId}, + #{warehouseId}, + #{stackingId}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{productId}, + + + + INSERT INTO bas_stock + (stock_id,cargo_space_id,stock_status,product_status,lot_no,in_date,back_date,product_guid,quantity,job_id,tray_code,out_quantity,stockin_detail_id,stockin_id,in_type,in_class_id,warehouse_id,stacking_id,spare1,spare2,spare3,spare4,spare5,spare6,product_id,product_name,voltage,power,phase,net_weight,gross_weight,distribution,model,order_id,spare7) + VALUES + + (#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.stackingId},#{item.spare1},#{item.spare2},#{item.spare3},#{item.spare4},#{item.spare5},#{item.spare6},#{item.productId} + ,#{item.productName},#{item.voltage},#{item.power},#{item.phase},#{item.netWeight},#{item.grossWeight},#{item.distribution},#{item.model},#{item.orderId},#{item.spare7}) + + + + + update bas_stock + + cargo_space_id = #{cargoSpaceId}, + stock_status = #{stockStatus}, + product_status = #{productStatus}, + lot_no = #{lotNo}, + in_date = #{inDate}, + back_date = #{backDate}, + product_guid = #{productGuid}, + quantity = #{quantity}, + job_id = #{jobId}, + tray_code = #{trayCode}, + out_quantity = #{outQuantity}, + stockin_detail_id = #{stockinDetailId}, + stockin_id = #{stockinId}, + in_type = #{inType}, + in_class_id = #{inClassId}, + warehouse_id = #{warehouseId}, + stacking_id = #{stackingId}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + spare4 = #{spare4}, + spare5 = #{spare5}, + spare6 = #{spare6}, + product_id = #{productId}, + + where stock_id = #{stockId} + + + update bas_stock set stock_status = #{stockStatus} where tray_code = #{trayCode} + + + update bas_stock set spare7 = '0' + + + + delete from bas_stock where stock_id = #{stockId} + + + + delete from bas_stock where stock_id in + + #{stockId} + + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/work/ViewNoDoneOutWorkMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/work/ViewNoDoneOutWorkMapper.xml new file mode 100644 index 0000000..79869d6 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/mapper/work/ViewNoDoneOutWorkMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutExceptionRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutExceptionRecordMapper.xml index 9e432c3..f34c2db 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutExceptionRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutExceptionRecordMapper.xml @@ -1,4 +1,4 @@ - + @@ -22,13 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -83,4 +83,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{outGuid} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutPickSubmitMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutPickSubmitMapper.xml index 37685d6..98b9731 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutPickSubmitMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutPickSubmitMapper.xml @@ -1,4 +1,4 @@ - + @@ -25,16 +25,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -98,4 +98,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutBackMapper.xml index 4f8f487..0e0f8cd 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutBackMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutBackMapper.xml @@ -1,4 +1,4 @@ - + @@ -33,43 +33,75 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id, start_date, finish_date, spare1, spare2, spare3, spare4, spare5, spare6, spare7, spare8, send_status, send_time, msg from out_stockout_back + select stockout_guid, + stockout_id, + out_type, + create_date, + department_no, + customer_no, + create_man_id, + status, + stockout_source, + warehouse_id, + class_now_id, + exit_id, + car_number, + FID, + erp_stockout_id, + start_date, + finish_date, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + spare7, + spare8, + send_status, + send_time, + msg, + company_short_name, + account_set_no + from out_stockout_back @@ -79,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -190,4 +222,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{stockoutGuid} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailBackMapper.xml index a3ee8a6..0b13b37 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailBackMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailBackMapper.xml @@ -1,102 +1,156 @@ - + + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - select stockout_detail_id, stockout_guid, stockout_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, allot_quantity, allot_quantity_x, allot_quantity_j, price, remark, warehouse_id, out_id, bukechai_quantity, kechai_quantity, entryid, flat_quantity, fid, erp_stockout_id, unit, spec, product_name, spare1, spare2, spare3, spare4, spare5, spare6, spare7, spare8, spare9, send_status, send_time, msg from out_stockout_detail_back + select stockout_detail_id, + stockout_guid, + stockout_id, + lot_no, + product_guid, + product_id, + quantity, + quantity_x, + quantity_j, + assign_num, + assign_num_x, + assign_num_j, + allot_quantity, + allot_quantity_x, + allot_quantity_j, + price, + remark, + warehouse_id, + out_id, + bukechai_quantity, + kechai_quantity, + entryid, + flat_quantity, + fid, + erp_stockout_id, + unit, + spec, + product_name, + spare1, + spare2, + spare3, + spare4, + spare5, + spare6, + spare7, + spare8, + spare9, + send_status, + send_time, + msg, + source_line_id, + bar_code, + is_batch_manage, + old_project_no + from out_stockout_detail_back - - - and stockout_detail_id = #{stockoutDetailId} - and stockout_guid = #{stockoutGuid} - and stockout_id = #{stockoutId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and allot_quantity = #{allotQuantity} - and allot_quantity_x = #{allotQuantityX} - and allot_quantity_j = #{allotQuantityJ} - and price = #{price} - and warehouse_id = #{warehouseId} - and out_id = #{outId} - and bukechai_quantity = #{bukechaiQuantity} - and kechai_quantity = #{kechaiQuantity} - and entryid = #{entryid} - and flat_quantity = #{flatQuantity} - and fid = #{fid} - and erp_stockout_id = #{erpStockoutId} - and unit = #{unit} - and spec = #{spec} - and product_name like concat('%', #{productName}, '%') - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} - and spare7 = #{spare7} - and spare8 = #{spare8} - and spare9 = #{spare9} - and send_status = #{sendStatus} - and send_time = #{sendTime} - and msg = #{msg} + + and stockout_detail_id like concat('%', #{stockoutDetailId}, '%') + + and stockout_guid like concat('%', #{stockoutGuid}, '%') + and stockout_id like concat('%', #{stockoutId}, '%') + and lot_no like concat('%', #{lotNo}, '%') + and product_guid like concat('%', #{productGuid}, '%') + and product_id like concat('%', #{productId}, '%') + and quantity like concat('%', #{quantity}, '%') + and quantity_x like concat('%', #{quantityX}, '%') + and quantity_j like concat('%', #{quantityJ}, '%') + and assign_num like concat('%', #{assignNum}, '%') + and assign_num_x like concat('%', #{assignNumX}, '%') + and assign_num_j like concat('%', #{assignNumJ}, '%') + and allot_quantity like concat('%', #{allotQuantity}, '%') + and allot_quantity_x like concat('%', #{allotQuantityX}, '%') + and allot_quantity_j like concat('%', #{allotQuantityJ}, '%') + and price like concat('%', #{price}, '%') + and warehouse_id like concat('%', #{warehouseId}, '%') + and out_id like concat('%', #{outId}, '%') + and bukechai_quantity like concat('%', #{bukechaiQuantity}, '%') + + and kechai_quantity like concat('%', #{kechaiQuantity}, '%') + and entryid like concat('%', #{entryid}, '%') + and flat_quantity like concat('%', #{flatQuantity}, '%') + and fid like concat('%', #{fid}, '%') + and erp_stockout_id like concat('%', #{erpStockoutId}, '%') + and unit like concat('%', #{unit}, '%') + and spec like concat('%', #{spec}, '%') + and product_name like concat('%', #{productName}, + '%') + + and spare1 like concat('%', #{spare1}, '%') + and spare2 like concat('%', #{spare2}, '%') + and spare3 like concat('%', #{spare3}, '%') + and spare4 like concat('%', #{spare4}, '%') + and spare5 like concat('%', #{spare5}, '%') + and spare6 like concat('%', #{spare6}, '%') + and spare7 like concat('%', #{spare7}, '%') + and spare8 like concat('%', #{spare8}, '%') + and spare9 like concat('%', #{spare9}, '%') + and send_status like concat('%', #{sendStatus}, '%') + and send_time like concat('%', #{sendTime}, '%') + and msg like concat('%', #{msg}, '%') - - where stockout_detail_id = #{stockoutDetailId} @@ -144,7 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" send_status, send_time, msg, - + #{stockoutDetailId}, #{stockoutGuid}, @@ -186,7 +240,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{sendStatus}, #{sendTime}, #{msg}, - + @@ -235,13 +289,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from out_stockout_detail_back where stockout_detail_id = #{stockoutDetailId} + delete + from out_stockout_detail_back + where stockout_detail_id = #{stockoutDetailId} - delete from out_stockout_detail_back where stockout_detail_id in + delete from out_stockout_detail_back where stockout_detail_id in #{stockoutDetailId} - \ No newline at end of file + + + INSERT INTO out_stockout_detail_back_finish + + SELECT * FROM out_stockout_detail_back + WHERE stockout_detail_id = #{item.stockoutDetailId} + + + + + DELETE FROM out_stockout_detail_back + WHERE stockout_detail_id IN + + #{item.stockoutDetailId} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml index 685c42c..56d4ac2 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml @@ -1,4 +1,4 @@ - + @@ -90,36 +90,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -259,3 +259,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where stockout_guid = #{stockoutGuid} + diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml index a1027eb..0e81ed7 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml @@ -1,4 +1,4 @@ - + @@ -57,42 +57,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -148,48 +148,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - #{stockoutDetailId}, - #{stockoutGuid}, - #{stockoutId}, - #{lotNo}, - #{productGuid}, - #{productId}, - #{productName}, - #{quantity}, - #{quantityX}, - #{quantityJ}, - #{assignNum}, - #{assignNumX}, - #{assignNumJ}, - #{allotQuantity}, - #{allotQuantityX}, - #{allotQuantityJ}, - #{price}, - #{remark}, - #{warehouseId}, - #{outId}, - #{bukechaiQuantity}, - #{kechaiQuantity}, - #{entryid}, - #{flatQuantity}, - #{fid}, - #{erpStockoutId}, - #{unit}, - #{spec}, - #{spare1}, - #{spare2}, - #{spare3}, - #{spare4}, - #{spare5}, - #{spare6}, - #{spare7}, - #{spare8}, - #{spare9}, - #{sourceLineId}, - #{barCode}, - #{isBatchManage}, - #{oldProjectNo}, - + #{stockoutDetailId}, + #{stockoutGuid}, + #{stockoutId}, + #{lotNo}, + #{productGuid}, + #{productId}, + #{productName}, + #{quantity}, + #{quantityX}, + #{quantityJ}, + #{assignNum}, + #{assignNumX}, + #{assignNumJ}, + #{allotQuantity}, + #{allotQuantityX}, + #{allotQuantityJ}, + #{price}, + #{remark}, + #{warehouseId}, + #{outId}, + #{bukechaiQuantity}, + #{kechaiQuantity}, + #{entryid}, + #{flatQuantity}, + #{fid}, + #{erpStockoutId}, + #{unit}, + #{spec}, + #{spare1}, + #{spare2}, + #{spare3}, + #{spare4}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, + #{spare9}, + #{sourceLineId}, + #{barCode}, + #{isBatchManage}, + #{oldProjectNo}, + @@ -256,3 +256,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where d.stockout_guid = #{stockoutGuid} + diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml index b66d614..53077b5 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml @@ -1,4 +1,4 @@ - + @@ -33,23 +33,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -142,26 +142,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join out_stockout_detail_finish d on d.stockout_id = o.stockout_id left join bas_product bp on bp.product_id = d.product_id - and o.stockout_guid = #{stockoutGuid} - and o.stockout_id = #{stockoutId} - and o.out_type = #{outType} - and o.department_no = #{departmentNo} - and o.customer_no = #{customerNo} - and o.create_man_id = #{createManId} - and o.status = #{status} - and o.stockout_source = #{stockoutSource} - and o.warehouse_id = #{warehouseId} - and o.class_now_id = #{classNowId} - and o.exit_id = #{exitId} - and o.car_number = #{carNumber} - and o.FID = #{FID} - and o.erp_stockout_id = #{erpStockoutId} + and o.stockout_guid like concat('%', #{stockoutGuid}, '%') + and o.stockout_id like concat('%', #{stockoutId}, '%') + and o.out_type like concat('%', #{outType}, '%') + and o.department_no like concat('%', #{departmentNo}, '%') + and o.customer_no like concat('%', #{customerNo}, '%') + and o.create_man_id like concat('%', #{createManId}, '%') + and o.status like concat('%', #{status}, '%') + and o.stockout_source like concat('%', #{stockoutSource}, '%') + and o.warehouse_id like concat('%', #{warehouseId}, '%') + and o.class_now_id like concat('%', #{classNowId}, '%') + and o.exit_id like concat('%', #{exitId}, '%') + and o.car_number like concat('%', #{carNumber}, '%') + and o.FID like concat('%', #{FID}, '%') + and o.erp_stockout_id like concat('%', #{erpStockoutId}, '%') and o.create_date >= #{startDate} and o.create_date <= #{finishDate} - and d.product_id = #{productId} + and d.product_id like concat('%', #{productId}, '%') and bp.product_name like concat('%', #{productName}, '%') and bc.customer_name like concat('%', #{customerName}, '%') order by o.create_date desc + diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml index c0edb4a..f52bdaf 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml @@ -1,4 +1,4 @@ - + @@ -40,36 +40,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -245,3 +246,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where o.stockout_id = #{stockoutId} + diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml index efa1542..65018da 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml @@ -1,4 +1,4 @@ - + @@ -59,47 +59,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and stock_id like concat('%', #{stockId}, '%') and cargo_space_id like concat('%', #{cargoSpaceId}, '%') - and stock_status = #{stockStatus} - and product_status = #{productStatus} - and lot_no = #{lotNo} - and in_date = #{inDate} - and back_date = #{backDate} - and product_guid = #{productGuid} - and quantity = #{quantity} - and job_id = #{jobId} - and tray_code = #{trayCode} - and out_quantity = #{outQuantity} - and stockin_detail_id = #{stockinDetailId} - and stockin_id = #{stockinId} - and in_type = #{inType} - and in_class_id = #{inClassId} - and warehouse_id = #{warehouseId} - and stacking_id = #{stackingId} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} - and product_id = #{productId} + and stock_status like concat('%', #{stockStatus}, '%') + and product_status like concat('%', #{productStatus}, '%') + and lot_no like concat('%', #{lotNo}, '%') + and in_date like concat('%', #{inDate}, '%') + and back_date like concat('%', #{backDate}, '%') + and product_guid like concat('%', #{productGuid}, '%') + and quantity like concat('%', #{quantity}, '%') + and job_id like concat('%', #{jobId}, '%') + and tray_code like concat('%', #{trayCode}, '%') + and out_quantity like concat('%', #{outQuantity}, '%') + and stockin_detail_id like concat('%', #{stockinDetailId}, '%') + and stockin_id like concat('%', #{stockinId}, '%') + and in_type like concat('%', #{inType}, '%') + and in_class_id like concat('%', #{inClassId}, '%') + and warehouse_id like concat('%', #{warehouseId}, '%') + and stacking_id like concat('%', #{stackingId}, '%') + and spare1 like concat('%', #{spare1}, '%') + and spare2 like concat('%', #{spare2}, '%') + and spare3 like concat('%', #{spare3}, '%') + and spare4 like concat('%', #{spare4}, '%') + and spare5 like concat('%', #{spare5}, '%') + and spare6 like concat('%', #{spare6}, '%') + and product_id like concat('%', #{productId}, '%') and product_name like concat('%', #{productName}, '%') - and voltage = #{voltage} - and power = #{power} - and phase = #{phase} - and net_weight = #{netWeight} - and gross_weight = #{grossWeight} - and distribution = #{distribution} - and model = #{model} - and order_id = #{orderId} - and spare7 = #{spare7} - and spare8 = #{spare8} + and voltage like concat('%', #{voltage}, '%') + and power like concat('%', #{power}, '%') + and phase like concat('%', #{phase}, '%') + and net_weight like concat('%', #{netWeight}, '%') + and gross_weight like concat('%', #{grossWeight}, '%') + and distribution like concat('%', #{distribution}, '%') + and model like concat('%', #{model}, '%') + and order_id like concat('%', #{orderId}, '%') + and spare7 like concat('%', #{spare7}, '%') + and spare8 like concat('%', #{spare8}, '%') and cargo_space_name like concat('%', #{cargoSpaceName}, '%') - and roadway_id = #{roadwayId} - and the_platoon = #{thePlatoon} - and the_column = #{theColumn} - and the_floor = #{theFloor} - and status = #{status} - and locked = #{locked} + and roadway_id like concat('%', #{roadwayId}, '%') + and the_platoon like concat('%', #{thePlatoon}, '%') + and the_column like concat('%', #{theColumn}, '%') + and the_floor like concat('%', #{theFloor}, '%') + and status like concat('%', #{status}, '%') + and locked like concat('%', #{locked}, '%') @@ -261,4 +261,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{stockId} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml index 0448d55..f2e0f0d 100644 --- a/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml @@ -8,6 +8,7 @@ {call proc_bind_tray_msg( #{v_tray_code,mode=IN,jdbcType=VARCHAR}, #{v_stockin_detail_id,mode=IN,jdbcType=VARCHAR}, + #{v_is_bound_accord,mode=IN,jdbcType=VARCHAR}, #{v_quantity,mode=IN,jdbcType=INTEGER}, #{v_result,mode=OUT,jdbcType=INTEGER}, #{v_resultmsg,mode=OUT,jdbcType=VARCHAR} @@ -151,7 +152,8 @@ #{v_tray_code,mode=IN,jdbcType=VARCHAR}, #{v_result,mode=OUT,jdbcType=INTEGER}, #{v_resultmsg,mode=OUT,jdbcType=VARCHAR} - )} + )} + diff --git a/ruoyi-admin/src/main/resources/mapper/pda/TrayMsgMapper.xml b/ruoyi-admin/src/main/resources/mapper/pda/TrayMsgMapper.xml index d56e423..c133e74 100644 --- a/ruoyi-admin/src/main/resources/mapper/pda/TrayMsgMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/pda/TrayMsgMapper.xml @@ -1,4 +1,4 @@ - + @@ -25,9 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join bas_product p on d.product_id=p.product_id left join bas_warehouse w on t.warehouse_id=w.warehouse_id - and t.tray_code = #{trayCode} - and t.stockin_detail_id = #{stockinDetailId} - and t.quantity = #{quantity} + and t.tray_code like concat('%', #{trayCode}, '%') + and t.stockin_detail_id like concat('%', #{stockinDetailId}, '%') + and t.quantity like concat('%', #{quantity}, '%') ${params.warehouseDataScope} @@ -78,4 +78,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml index 8b9d313..d9378e5 100644 --- a/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/productAndStock/ViewProductAndStockMapper.xml @@ -1,4 +1,4 @@ - + @@ -33,22 +33,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -60,24 +60,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultMap="ViewProductAndStockResult"> - and only_identity = #{onlyIdentity} - and product_id = #{productId} - and lot_no = #{lotNo} + and only_identity like concat('%', #{onlyIdentity}, '%') + and product_id like concat('%', #{productId}, '%') + and lot_no like concat('%', #{lotNo}, '%') and product_name like concat('%', #{productName}, '%') - and quantity = #{quantity} - and warehouse_id = #{warehouseId} - and stacking_id = #{stackingId} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} - and voltage = #{voltage} - and power = #{power} - and phase = #{phase} + and quantity like concat('%', #{quantity}, '%') + and warehouse_id like concat('%', #{warehouseId}, '%') + and stacking_id like concat('%', #{stackingId}, '%') + and spare1 like concat('%', #{spare1}, '%') + and spare2 like concat('%', #{spare2}, '%') + and spare3 like concat('%', #{spare3}, '%') + and spare4 like concat('%', #{spare4}, '%') + and spare5 like concat('%', #{spare5}, '%') + and spare6 like concat('%', #{spare6}, '%') + and voltage like concat('%', #{voltage}, '%') + and power like concat('%', #{power}, '%') + and phase like concat('%', #{phase}, '%') @@ -154,3 +154,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml index c14cb0a..abbf8c2 100644 --- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml @@ -1,4 +1,4 @@ - + @@ -87,31 +87,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -123,31 +123,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultMap="ReceiveStockinDetailResult"> - and stockin_guid = #{stockinGuid} - and stockin_id = #{stockinId} - and lot_no = #{lotNo} - and product_guid = #{productGuid} - and product_id = #{productId} - and quantity = #{quantity} - and quantity_x = #{quantityX} - and quantity_j = #{quantityJ} - and price = #{price} - and cargo_no = #{cargoNo} - and assign_num = #{assignNum} - and assign_num_x = #{assignNumX} - and assign_num_j = #{assignNumJ} - and print_date = #{printDate} - and stock_status = #{stockStatus} - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and unit = #{unit} - and spec = #{spec} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and spare4 = #{spare4} - and spare5 = #{spare5} - and spare6 = #{spare6} + and stockin_guid like concat('%', #{stockinGuid}, '%') + and stockin_id like concat('%', #{stockinId}, '%') + and lot_no like concat('%', #{lotNo}, '%') + and product_guid like concat('%', #{productGuid}, '%') + and product_id like concat('%', #{productId}, '%') + and quantity like concat('%', #{quantity}, '%') + and quantity_x like concat('%', #{quantityX}, '%') + and quantity_j like concat('%', #{quantityJ}, '%') + and price like concat('%', #{price}, '%') + and cargo_no like concat('%', #{cargoNo}, '%') + and assign_num like concat('%', #{assignNum}, '%') + and assign_num_x like concat('%', #{assignNumX}, '%') + and assign_num_j like concat('%', #{assignNumJ}, '%') + and print_date like concat('%', #{printDate}, '%') + and stock_status like concat('%', #{stockStatus}, '%') + and supplier_id like concat('%', #{supplierId}, '%') + and customer_id like concat('%', #{customerId}, '%') + and unit like concat('%', #{unit}, '%') + and spec like concat('%', #{spec}, '%') + and spare1 like concat('%', #{spare1}, '%') + and spare2 like concat('%', #{spare2}, '%') + and spare3 like concat('%', #{spare3}, '%') + and spare4 like concat('%', #{spare4}, '%') + and spare5 like concat('%', #{spare5}, '%') + and spare6 like concat('%', #{spare6}, '%') @@ -257,3 +257,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml index 7dd1219..bfb6770 100644 --- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailMapper.xml @@ -1,4 +1,4 @@ - + @@ -58,31 +58,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -202,3 +202,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml index 5660555..1f847da 100644 --- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml @@ -1,4 +1,4 @@ - + @@ -86,24 +86,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -114,24 +114,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and rs.stockin_id = #{stockinId} - and rs.in_type = #{inType} - and rs.create_date = #{createDate} - and rs.create_man_id = #{createManId} - and rs.status = #{status} - and rs.warehouse_id = #{warehouseId} - and rs.spare5 = #{spare5} - and rs.spare4 = #{spare4} - and rs.spare3 = #{spare3} - and rs.finish_date = #{finishDate} - and rs.spare2 = #{spare2} - and rs.spare1 = #{spare1} - and rs.erp_bill = #{erpBill} - and rs.stock_source = #{stockSource} - and rs.department_no = #{departmentNo} - and rs.customer_no = #{customerNo} - and rs.class_no = #{classNo} - and rs.supplier_no = #{supplierNo} + and rs.stockin_id like concat('%', #{stockinId}, '%') + and rs.in_type like concat('%', #{inType}, '%') + and rs.create_date like concat('%', #{createDate}, '%') + and rs.create_man_id like concat('%', #{createManId}, '%') + and rs.status like concat('%', #{status}, '%') + and rs.warehouse_id like concat('%', #{warehouseId}, '%') + and rs.spare5 like concat('%', #{spare5}, '%') + and rs.spare4 like concat('%', #{spare4}, '%') + and rs.spare3 like concat('%', #{spare3}, '%') + and rs.finish_date like concat('%', #{finishDate}, '%') + and rs.spare2 like concat('%', #{spare2}, '%') + and rs.spare1 like concat('%', #{spare1}, '%') + and rs.erp_bill like concat('%', #{erpBill}, '%') + and rs.stock_source like concat('%', #{stockSource}, '%') + and rs.department_no like concat('%', #{departmentNo}, '%') + and rs.customer_no like concat('%', #{customerNo}, '%') + and rs.class_no like concat('%', #{classNo}, '%') + and rs.supplier_no like concat('%', #{supplierNo}, '%') and rs.stockin_id in ( select distinct stockin_id from receive_stockin_detail rsd @@ -195,3 +195,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml b/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml index 794571f..c5e87c1 100644 --- a/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml @@ -1,4 +1,4 @@ - + @@ -29,20 +29,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -118,4 +118,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{requestId} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml index 60b2b8d..5ca5fde 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml @@ -1,4 +1,4 @@ - + @@ -64,50 +64,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and job_id like concat('%', #{jobId}, '%') - and status = #{status} - and on_line_type = #{onLineType} + and status like concat('%', #{status}, '%') + and on_line_type like concat('%', #{onLineType}, '%') and task_no like concat('%', #{taskNo}, '%') - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and department_id = #{departmentId} + and supplier_id like concat('%', #{supplierId}, '%') + and customer_id like concat('%', #{customerId}, '%') + and department_id like concat('%', #{departmentId}, '%') and tray_code like concat('%', #{trayCode}, '%') - and roadway_id = #{roadwayId} - and cargo_space_id = #{cargoSpaceId} - and target_roadway_id = #{targetRoadwayId} - and target_cargo_space_id = #{targetCargoSpaceId} + and roadway_id like concat('%', #{roadwayId}, '%') + and cargo_space_id like concat('%', #{cargoSpaceId}, '%') + and target_roadway_id like concat('%', #{targetRoadwayId}, '%') + and target_cargo_space_id like concat('%', #{targetCargoSpaceId}, '%') and line_id like concat('%', #{lineId}, '%') - and workshop_id = #{workshopId} - and priority = #{priority} - and execution_phase = #{executionPhase} - and in_or_out = #{inOrOut} - and start_time = #{startTime} - and finish_time = #{finishTime} - and entrance_id = #{entranceId} - and exit_id = #{exitId} - and class_id = #{classId} - and warehouse_id = #{warehouseId} - and fault_flag = #{faultFlag} - and job_detail_id = #{jobDetailId} - and stock_id = #{stockId} - and lot_no = #{lotNo} - and in_date = #{inDate} - and in_or_out_id = #{inOrOutId} - and in_or_out_d_id = #{inOrOutDId} - and product_guid = #{productGuid} - and stock_status = #{stockStatus} - and in_quantity = #{inQuantity} - and stock_quantity = #{stockQuantity} - and out_quantity = #{outQuantity} - and stockin_id = #{stockinId} - and stacking_id = #{stackingId} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and stockin_detail_id = #{stockinDetailId} - and spare5 = #{spare5} - and spare6 = #{spare6} - and spec = #{spec} - and unit = #{unit} + and workshop_id like concat('%', #{workshopId}, '%') + and priority like concat('%', #{priority}, '%') + and execution_phase like concat('%', #{executionPhase}, '%') + and in_or_out like concat('%', #{inOrOut}, '%') + and start_time like concat('%', #{startTime}, '%') + and finish_time like concat('%', #{finishTime}, '%') + and entrance_id like concat('%', #{entranceId}, '%') + and exit_id like concat('%', #{exitId}, '%') + and class_id like concat('%', #{classId}, '%') + and warehouse_id like concat('%', #{warehouseId}, '%') + and fault_flag like concat('%', #{faultFlag}, '%') + and job_detail_id like concat('%', #{jobDetailId}, '%') + and stock_id like concat('%', #{stockId}, '%') + and lot_no like concat('%', #{lotNo}, '%') + and in_date like concat('%', #{inDate}, '%') + and in_or_out_id like concat('%', #{inOrOutId}, '%') + and in_or_out_d_id like concat('%', #{inOrOutDId}, '%') + and product_guid like concat('%', #{productGuid}, '%') + and stock_status like concat('%', #{stockStatus}, '%') + and in_quantity like concat('%', #{inQuantity}, '%') + and stock_quantity like concat('%', #{stockQuantity}, '%') + and out_quantity like concat('%', #{outQuantity}, '%') + and stockin_id like concat('%', #{stockinId}, '%') + and stacking_id like concat('%', #{stackingId}, '%') + and spare1 like concat('%', #{spare1}, '%') + and spare2 like concat('%', #{spare2}, '%') + and spare3 like concat('%', #{spare3}, '%') + and stockin_detail_id like concat('%', #{stockinDetailId}, '%') + and spare5 like concat('%', #{spare5}, '%') + and spare6 like concat('%', #{spare6}, '%') + and spec like concat('%', #{spec}, '%') + and unit like concat('%', #{unit}, '%') and product_id like concat('%', #{productId}, '%') and product_name like concat('%', #{productName}, '%') and cargo_space_name like concat('%', #{cargoSpaceName}, '%') @@ -290,4 +290,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{jobId} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml index 69d3e3a..2522f3e 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml @@ -1,4 +1,4 @@ - + @@ -64,50 +64,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and job_id like concat('%', #{jobId}, '%') - and status = #{status} - and on_line_type = #{onLineType} + and status like concat('%', #{status}, '%') + and on_line_type like concat('%', #{onLineType}, '%') and task_no like concat('%', #{taskNo}, '%') - and supplier_id = #{supplierId} - and customer_id = #{customerId} - and department_id = #{departmentId} + and supplier_id like concat('%', #{supplierId}, '%') + and customer_id like concat('%', #{customerId}, '%') + and department_id like concat('%', #{departmentId}, '%') and tray_code like concat('%', #{trayCode}, '%') - and roadway_id = #{roadwayId} - and cargo_space_id = #{cargoSpaceId} - and target_roadway_id = #{targetRoadwayId} - and target_cargo_space_id = #{targetCargoSpaceId} + and roadway_id like concat('%', #{roadwayId}, '%') + and cargo_space_id like concat('%', #{cargoSpaceId}, '%') + and target_roadway_id like concat('%', #{targetRoadwayId}, '%') + and target_cargo_space_id like concat('%', #{targetCargoSpaceId}, '%') and line_id like concat('%', #{lineId}, '%') - and workshop_id = #{workshopId} - and priority = #{priority} - and execution_phase = #{executionPhase} - and in_or_out = #{inOrOut} - and start_time = #{startTime} - and finish_time = #{finishTime} - and entrance_id = #{entranceId} - and exit_id = #{exitId} - and class_id = #{classId} - and warehouse_id = #{warehouseId} - and fault_flag = #{faultFlag} - and job_detail_id = #{jobDetailId} - and stock_id = #{stockId} - and lot_no = #{lotNo} - and in_date = #{inDate} - and in_or_out_id = #{inOrOutId} - and in_or_out_d_id = #{inOrOutDId} - and product_guid = #{productGuid} - and stock_status = #{stockStatus} - and in_quantity = #{inQuantity} - and stock_quantity = #{stockQuantity} - and out_quantity = #{outQuantity} - and stockin_id = #{stockinId} - and stacking_id = #{stackingId} - and spare1 = #{spare1} - and spare2 = #{spare2} - and spare3 = #{spare3} - and stockin_detail_id = #{stockinDetailId} + and workshop_id like concat('%', #{workshopId}, '%') + and priority like concat('%', #{priority}, '%') + and execution_phase like concat('%', #{executionPhase}, '%') + and in_or_out like concat('%', #{inOrOut}, '%') + and start_time like concat('%', #{startTime}, '%') + and finish_time like concat('%', #{finishTime}, '%') + and entrance_id like concat('%', #{entranceId}, '%') + and exit_id like concat('%', #{exitId}, '%') + and class_id like concat('%', #{classId}, '%') + and warehouse_id like concat('%', #{warehouseId}, '%') + and fault_flag like concat('%', #{faultFlag}, '%') + and job_detail_id like concat('%', #{jobDetailId}, '%') + and stock_id like concat('%', #{stockId}, '%') + and lot_no like concat('%', #{lotNo}, '%') + and in_date like concat('%', #{inDate}, '%') + and in_or_out_id like concat('%', #{inOrOutId}, '%') + and in_or_out_d_id like concat('%', #{inOrOutDId}, '%') + and product_guid like concat('%', #{productGuid}, '%') + and stock_status like concat('%', #{stockStatus}, '%') + and in_quantity like concat('%', #{inQuantity}, '%') + and stock_quantity like concat('%', #{stockQuantity}, '%') + and out_quantity like concat('%', #{outQuantity}, '%') + and stockin_id like concat('%', #{stockinId}, '%') + and stacking_id like concat('%', #{stackingId}, '%') + and spare1 like concat('%', #{spare1}, '%') + and spare2 like concat('%', #{spare2}, '%') + and spare3 like concat('%', #{spare3}, '%') + and stockin_detail_id like concat('%', #{stockinDetailId}, '%') and spare5 like concat('%', #{spare5}, '%') - and spare6 = #{spare6} - and spec = #{spec} - and unit = #{unit} + and spare6 like concat('%', #{spare6}, '%') + and spec like concat('%', #{spec}, '%') + and unit like concat('%', #{unit}, '%') and product_id like concat('%', #{productId}, '%') and product_name like concat('%', #{productName}, '%') and cargo_space_name like concat('%', #{cargoSpaceName}, '%') @@ -290,4 +290,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{jobId} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml index 6881df7..ecb5e5d 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml @@ -1,4 +1,4 @@ - + @@ -54,46 +54,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -246,4 +246,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{onlyIdentity} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml index 3c958a5..2cc2774 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml @@ -1,4 +1,4 @@ - + @@ -103,8 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and stock_id like concat('%', #{stockId}, '%') and cargo_space_id like concat('%', #{cargoSpaceId}, '%') - and stock_status = #{stockStatus} - and product_status = #{productStatus} + and stock_status like concat('%', #{stockStatus}, '%') + and product_status like concat('%', #{productStatus}, '%') and lot_no like concat('%', #{lotNo}, '%') and in_date like concat('%', #{inDate}, '%') and back_date like concat('%', #{backDate}, '%') @@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and out_quantity like concat('%', #{outQuantity}, '%') and stockin_detail_id like concat('%', #{stockinDetailId}, '%') and stockin_id like concat('%', #{stockinId}, '%') - and in_type = #{inType} + and in_type like concat('%', #{inType}, '%') and in_class_id like concat('%', #{inClassId}, '%') and warehouse_id like concat('%', #{warehouseId}, '%') and stacking_id like concat('%', #{stackingId}, '%') @@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and c_desc like concat('%', #{cDesc}, '%') and warehouse_kind like concat('%', #{warehouseKind}, '%') and warehouse_type like concat('%', #{warehouseType}, '%') - and is_current = #{isCurrent} + and is_current like concat('%', #{isCurrent}, '%') and product_guid like concat('%', #{productGuid}, '%') and product_id like concat('%', #{productId}, '%') and parent_id like concat('%', #{parentId}, '%') @@ -180,8 +180,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and the_platoon like concat('%', #{thePlatoon}, '%') and the_column like concat('%', #{theColumn}, '%') and the_floor like concat('%', #{theFloor}, '%') - and cargo_status = #{cargoStatus} - and locked = #{locked} + and cargo_status like concat('%', #{cargoStatus}, '%') + and locked like concat('%', #{locked}, '%') and cargo_hight like concat('%', #{cargoHight}, '%') and iss_double like concat('%', #{issDouble}, '%') and group_coding_no like concat('%', #{groupCodingNo}, '%') @@ -481,4 +481,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{stockId} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml index abea5e6..a5d82bd 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml @@ -1,4 +1,4 @@ - + @@ -103,8 +103,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and stock_id like concat('%', #{stockId}, '%') and cargo_space_id like concat('%', #{cargoSpaceId}, '%') - and stock_status = #{stockStatus} - and product_status = #{productStatus} + and stock_status like concat('%', #{stockStatus}, '%') + and product_status like concat('%', #{productStatus}, '%') and lot_no like concat('%', #{lotNo}, '%') and in_date like concat('%', #{inDate}, '%') and back_date like concat('%', #{backDate}, '%') @@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and out_quantity like concat('%', #{outQuantity}, '%') and stockin_detail_id like concat('%', #{stockinDetailId}, '%') and stockin_id like concat('%', #{stockinId}, '%') - and in_type = #{inType} + and in_type like concat('%', #{inType}, '%') and in_class_id like concat('%', #{inClassId}, '%') and warehouse_id like concat('%', #{warehouseId}, '%') and stacking_id like concat('%', #{stackingId}, '%') @@ -180,8 +180,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and the_platoon like concat('%', #{thePlatoon}, '%') and the_column like concat('%', #{theColumn}, '%') and the_floor like concat('%', #{theFloor}, '%') - and cargo_status = #{cargoStatus} - and locked = #{locked} + and cargo_status like concat('%', #{cargoStatus}, '%') + and locked like concat('%', #{locked}, '%') and cargo_hight like concat('%', #{cargoHight}, '%') and iss_double like concat('%', #{issDouble}, '%') and group_coding_no like concat('%', #{groupCodingNo}, '%') @@ -481,4 +481,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{stockId} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml index ee6b8ca..87fdbf3 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml @@ -1,4 +1,4 @@ - + @@ -53,43 +53,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -240,4 +240,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{stockinGuid} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml index ba2e846..a200e57 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml @@ -1,4 +1,4 @@ - + @@ -45,36 +45,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -200,4 +200,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{stockoutGuid} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml index 33487a0..ac95dfb 100644 --- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockFreezeRecordMapper.xml @@ -1,4 +1,4 @@ - + @@ -37,22 +37,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - and stock_id = #{stockId} - and bsmr.cargo_space_id = #{cargoSpaceId} - and bsmr.tray_code = #{trayCode} - and product_id = #{productId} + and stock_id like concat('%', #{stockId}, '%') + and bsmr.cargo_space_id like concat('%', #{cargoSpaceId}, '%') + and bsmr.tray_code like concat('%', #{trayCode}, '%') + and product_id like concat('%', #{productId}, '%') and product_name like concat('%', #{productName}, '%') - and print_date = #{printDate} - and lot_no = #{lotNo} - and old_quantity = #{oldQuantity} - and quantity = #{quantity} - and method = #{method} - and bsmr.warehouse_id = #{warehouseId} - and stock_detail_id = #{stockDetailId} - and operating_target = #{operatingTarget} - and bar_code_old_quantity = #{barCodeOldQuantity} - and bar_code_quantity = #{barCodeQuantity} - and product_guid = #{productGuid} + and print_date like concat('%', #{printDate}, '%') + and lot_no like concat('%', #{lotNo}, '%') + and old_quantity like concat('%', #{oldQuantity}, '%') + and quantity like concat('%', #{quantity}, '%') + and method like concat('%', #{method}, '%') + and bsmr.warehouse_id like concat('%', #{warehouseId}, '%') + and stock_detail_id like concat('%', #{stockDetailId}, '%') + and operating_target like concat('%', #{operatingTarget}, '%') + and bar_code_old_quantity like concat('%', #{barCodeOldQuantity}, '%') + and bar_code_quantity like concat('%', #{barCodeQuantity}, '%') + and product_guid like concat('%', #{productGuid}, '%') ${params.warehouseDataScope} @@ -144,3 +144,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml index b24b53c..5f63d94 100644 --- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml @@ -1,4 +1,4 @@ - + @@ -69,46 +69,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id + + select bs.stock_id, bs.cargo_space_id, bs.stock_status, bs.product_status, bs.lot_no, bs.in_date, + bs.back_date, bs.product_guid, bs.quantity, bs.job_id, bs.tray_code, bs.out_quantity, + bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.in_class_id, bs.warehouse_id, bs.stacking_id, + bs.spare1, bs.spare2, bs.spare3, bs.spare4, bs.spare5, bs.spare6 , + bs.voltage,bs.power,bs.phase,bs.net_weight,bs.gross_weight,bs.distribution,bs.model,bs.order_id, + bs.product_name + from bas_stock_hc bs + + + + @@ -250,10 +262,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + +